丁玲 / A6079080424317 · 提交

转到一个项目

作者 dl
提交 5f0abcee7d73c5e74a31305fe1d5fc11b3edeeee 1 个父辈 9baa9f77

时间模块 健康档案问题

内嵌 并排对比
正在显示 22 个修改的文件 包含 630 行增加 和 233 行删除
@@ -239,14 +239,18 @@ function formatTen(num) { @@ -239,14 +239,18 @@ function formatTen(num) {
239 return num > 9 ? (num + "") : ("0" + num); 239 return num > 9 ? (num + "") : ("0" + num);
240 } 240 }
241 241
242 -function formatDate(date) { 242 +function formatDate(date, type) {
243 var year = date.getFullYear(); 243 var year = date.getFullYear();
244 var month = date.getMonth() + 1; 244 var month = date.getMonth() + 1;
245 var day = date.getDate(); 245 var day = date.getDate();
246 var hour = date.getHours(); 246 var hour = date.getHours();
247 var minute = date.getMinutes(); 247 var minute = date.getMinutes();
248 var second = date.getSeconds(); 248 var second = date.getSeconds();
249 - return year + "-" + formatTen(month) + "-" + formatTen(day) 249 + if (type == 1) {
  250 + return year + "-" + formatTen(month) + "-" + formatTen(day)
  251 + } else {
  252 + return year + "-" + formatTen(month) + "-" + formatTen(day) + ' ' + formatTen(hour) + ':' + formatTen(minute)
  253 + }
250 } 254 }
251 255
252 function timestampToTime(timestamp) { 256 function timestampToTime(timestamp) {
@@ -272,7 +276,7 @@ function checkDate(date, type) { @@ -272,7 +276,7 @@ function checkDate(date, type) {
272 var dates = Math.floor(ms / 1000 / 60 / 60); 276 var dates = Math.floor(ms / 1000 / 60 / 60);
273 // alert(dates) 277 // alert(dates)
274 if (type == 1) { 278 if (type == 1) {
275 - if (dates < 3) { 279 + if (dates < 3 || dates > 171) {
276 return false; 280 return false;
277 } else { 281 } else {
278 return true; 282 return true;
@@ -299,12 +303,21 @@ function getTimeDetil(num) { @@ -299,12 +303,21 @@ function getTimeDetil(num) {
299 var date = new Date(); 303 var date = new Date();
300 var Y, M, D, h, m, s; 304 var Y, M, D, h, m, s;
301 Y = date.getFullYear() + '-'; 305 Y = date.getFullYear() + '-';
302 - M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';  
303 - D = date.getDate() + ' ';  
304 - h = date.getHours() + num + ':'; 306 + M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
  307 + D = date.getDate();
  308 + h = date.getHours() + num;
305 m = date.getMinutes(); 309 m = date.getMinutes();
306 s = date.getSeconds(); 310 s = date.getSeconds();
307 - return Y + M + D + h + m 311 + if ((date.getHours() + num) > 24) {
  312 + h = h < 10 ? ('0' + (date.getHours() + num) % 24) : ((date.getHours() + num) % 24);
  313 + if (D < 30) {
  314 + D = parseInt(D) + Math.floor((date.getHours() + num) / 24)
  315 + } else {
  316 + D = '0' + 1;
  317 + M = M < 10 ? '0' + (parseInt(M) + 1) : parseInt(M) + 1;
  318 + }
  319 + }
  320 + return Y + M + '-' + D + ' ' + h + ':' + m
308 } 321 }
309 322
310 function toDecimal2(x) { 323 function toDecimal2(x) {
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
6 content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> 6 content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
7 <title>CS</title> 7 <title>CS</title>
8 <link rel="stylesheet" href="cs.min.css"> 8 <link rel="stylesheet" href="cs.min.css">
  9 + <link rel="stylesheet" href="../../css/weui.min.css">
  10 + <link rel="stylesheet" href="../../css/api.css">
9 <style> 11 <style>
10 .rongcloud-blueBg { 12 .rongcloud-blueBg {
11 background: none; 13 background: none;
@@ -16,15 +18,30 @@ @@ -16,15 +18,30 @@
16 background: #dbb25f; 18 background: #dbb25f;
17 border-radius: 0.1rem; 19 border-radius: 0.1rem;
18 } 20 }
  21 +
  22 + .rongcloud-rong-send-btn {
  23 + background: #dbb25f !important;
  24 + }
  25 +
  26 + .rongcloud-funcPanel .rongcloud-mode2 a {
  27 + color: #dbb25f
  28 + }
19 </style> 29 </style>
20 </head> 30 </head>
21 <body> 31 <body>
22 - 32 +<div id="header" class="rongcloud-rong-header rongcloud-blueBg rongcloud-online">
  33 + <span class="rongcloud-phone-exit" onclick="closeWindow()"></span>
  34 + <div class="rongcloud-phone-infoBar">
  35 + <span class="rongcloud-phone-kefuName" style="font-size: 14px;">咨询客服</span>
  36 + </div>
  37 +</div>
23 <div id="rcs-app"> 38 <div id="rcs-app">
24 39
25 </div> 40 </div>
26 <script src="../../js/api.js"></script> 41 <script src="../../js/api.js"></script>
27 <script src="../../js/weui.min.js"></script> 42 <script src="../../js/weui.min.js"></script>
  43 +<script src="../../js/axios.min.js"></script>
  44 +<script src="../../js/public.js"></script>
28 <!-- 可以将 SDK 下载到本地 配置 gruntfile 与 cs.js 合并压缩成一个 js 文件 --> 45 <!-- 可以将 SDK 下载到本地 配置 gruntfile 与 cs.js 合并压缩成一个 js 文件 -->
29 <script src="../RongIMLib-cs.min.js"></script> 46 <script src="../RongIMLib-cs.min.js"></script>
30 <script src="//cdn.ronghub.com/RongIMVoice-2.2.4.min.js"></script> 47 <script src="//cdn.ronghub.com/RongIMVoice-2.2.4.min.js"></script>
@@ -32,16 +49,20 @@ @@ -32,16 +49,20 @@
32 <script> 49 <script>
33 var rongYunToken = ''; 50 var rongYunToken = '';
34 var customerServiceId = ''; 51 var customerServiceId = '';
  52 + var user_type = [];
35 apiready = function () { 53 apiready = function () {
  54 +
36 console.log(RCS) 55 console.log(RCS)
37 rongYunToken = api.pageParam.rongYunToken; 56 rongYunToken = api.pageParam.rongYunToken;
38 customerServiceId = api.pageParam.userId; 57 customerServiceId = api.pageParam.userId;
  58 + user_type = api.pageParam.user_type;
39 RCS.init({ 59 RCS.init({
40 - appKey: "c9kqb3rdkh4jj",  
41 - // token: "qjxXwJizd7Y62DTmUEluw5lzpNwuJBCkPrRErVG12EKi1UP6giNGqszv6IQX0IndGKwjoGwevVmUVSN0x458KOqK0LwxTuhy",  
42 - token:rongYunToken , 60 + appKey: "8w7jv4qb82s2y",
  61 + // token: "wG5sHjQtfgwuZ4F2Jl1f3DCABMOr8MwyoL1v7wbF6L6/yYC3MBnTnRoOlv2d4cOJoqNM2oO263uUt+JN9vbApg==",
  62 + token: rongYunToken,
43 target: document.getElementById('rcs-app'), 63 target: document.getElementById('rcs-app'),
44 - customerServiceId: "KEFU150535341165880", // 客服Id 64 + customerServiceId: "KEFU153130751974494", // 客服Id
  65 + // customerServiceId: "KEFU150535341165880", // 客服Id
45 userIcon: 'http://7xo1cb.com1.z0.glb.clouddn.com/rongcloudkefu2.png',//用户默认头像，在用户没有头像的时候显示 66 userIcon: 'http://7xo1cb.com1.z0.glb.clouddn.com/rongcloudkefu2.png',//用户默认头像，在用户没有头像的时候显示
46 csIcon: 'http://fsprodrcx.cn.ronghub.com/UQRxDVEHcD6_gHENUQRxDUs9XOZRBH25PGECfjBjFA/base64.png',//客服默认头像，在客服没有头像的时候显示,建议线上地址 67 csIcon: 'http://fsprodrcx.cn.ronghub.com/UQRxDVEHcD6_gHENUQRxDUs9XOZRBH25PGECfjBjFA/base64.png',//客服默认头像，在客服没有头像的时候显示,建议线上地址
47 showButton: false, 68 showButton: false,
@@ -51,9 +72,11 @@ @@ -51,9 +72,11 @@
51 },//连接中的执行的方法，例如显示加载页面,可不传 72 },//连接中的执行的方法，例如显示加载页面,可不传
52 connectedCallback: function () { 73 connectedCallback: function () {
53 },//连接成功之后的方法，例如关闭加载页面,可不传 74 },//连接成功之后的方法，例如关闭加载页面,可不传
54 - disconnectedCallback: function () {  
55 - alert('连接断开');  
56 - closeWindow() 75 + disconnectedCallback: function (e) {
  76 + toastMsg('连接断开');
  77 + setTimeout(function () {
  78 + closeWindow()
  79 + }, 1000)
57 },//断开连接之后的操作,可不传 80 },//断开连接之后的操作,可不传
58 templates: { 81 templates: {
59 // button: ['<div class="rongcloud-consult">', 82 // button: ['<div class="rongcloud-consult">',
@@ -73,8 +96,6 @@ @@ -73,8 +96,6 @@
73 // userInfo: 'templates/userInfo.html', 96 // userInfo: 'templates/userInfo.html',
74 } 97 }
75 }); 98 });
76 - RCS.close();  
77 -  
78 } 99 }
79 100
80 </script> 101 </script>
@@ -33,11 +33,13 @@ @@ -33,11 +33,13 @@
33 el: '#app', 33 el: '#app',
34 data: { 34 data: {
35 rongYunToken: '', 35 rongYunToken: '',
36 - userId: '' 36 + userId: '',
  37 + user_type:[]
37 }, 38 },
38 created: function () { 39 created: function () {
39 apiready = function () { 40 apiready = function () {
40 app.getRongYunToken(); 41 app.getRongYunToken();
  42 + app.getUserIndexInfo();
41 api.openFrame({ 43 api.openFrame({
42 name: 'cs', 44 name: 'cs',
43 url: '../../assets/sobot/dist/cs.html', 45 url: '../../assets/sobot/dist/cs.html',
@@ -50,7 +52,8 @@ @@ -50,7 +52,8 @@
50 pageParam: { 52 pageParam: {
51 rongYunToken: app.rongYunToken, 53 rongYunToken: app.rongYunToken,
52 // rongYunToken: '122344545', 54 // rongYunToken: '122344545',
53 - userId: app.userId 55 + userId: app.userId,
  56 + user_type:app.user_type
54 } 57 }
55 }); 58 });
56 59
@@ -73,6 +76,20 @@ @@ -73,6 +76,20 @@
73 } 76 }
74 }) 77 })
75 }, 78 },
  79 + getUserIndexInfo: function () {
  80 + var header = {
  81 + "XX-Device-Type": getDevice(),
  82 + 'XX-Token': getToken()
  83 + };
  84 + getRequest('post', 'user/index/getUserIndexInfo', null, header).then(function (res) {
  85 + // alert(JSON.stringify(res));
  86 + if (res.data.code == 1) {
  87 + app.user_type = res.data.data;
  88 + } else {
  89 + }
  90 + loadEnd()
  91 + });
  92 + }
76 } 93 }
77 }) 94 })
78 </script> 95 </script>
@@ -8,9 +8,8 @@ @@ -8,9 +8,8 @@
8 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no"> 8 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
9 <title></title> 9 <title></title>
10 <script src="../../assets/js/fontsize.js"></script> 10 <script src="../../assets/js/fontsize.js"></script>
11 - <!--<link rel="stylesheet" href="../../assets/css/weui.min.css">-->  
12 - <link rel="stylesheet" href="../../assets/css/api.css"/>  
13 - <link rel="stylesheet" href="../../assets/css/style.css"> 11 + <link rel="stylesheet" href="../../assets/css/weui.min.css">
  12 + <link rel="stylesheet" href="../../assets/css/api.css">
14 <link rel="stylesheet" href="../../assets/icon/iconfont.css"> 13 <link rel="stylesheet" href="../../assets/icon/iconfont.css">
15 <style> 14 <style>
16 15
@@ -36,10 +35,6 @@ @@ -36,10 +35,6 @@
36 height: 100%; 35 height: 100%;
37 } 36 }
38 37
39 - .v-modal {  
40 - background: none;  
41 - }  
42 -  
43 .meal { 38 .meal {
44 display: flex; 39 display: flex;
45 flex-direction: column; 40 flex-direction: column;
@@ -53,36 +48,12 @@ @@ -53,36 +48,12 @@
53 background: none; 48 background: none;
54 } 49 }
55 50
56 - .mint-datetime-action {  
57 - color: #fff;  
58 - background-color: #dbb25f;  
59 - }  
60 -  
61 - .mint-datetime-cancel {  
62 - background-color: #fff;  
63 - color: #424242;  
64 - }  
65 -  
66 - .picker-slot {  
67 - font-size: 12px;  
68 - }  
69 </style> 51 </style>
70 </head> 52 </head>
71 <body> 53 <body>
72 <div id="app" v-cloak> 54 <div id="app" v-cloak>
73 - <div @click="close" class="meal">  
74 - <mt-datetime-picker  
75 - ref="picker"  
76 - :endDate="endDate"  
77 - :startDate="startDate"  
78 - type="date"  
79 - v-model="pickerValue"  
80 - year-format="{value}年"  
81 - month-format="{value}月"  
82 - date-format="{value}日"  
83 - @confirm="choose_bro"  
84 - >  
85 - </mt-datetime-picker> 55 + <div class="meal">
  56 + <input id="sever" autofocus placeholder="1" type="hidden">
86 </div> 57 </div>
87 </div> 58 </div>
88 </body> 59 </body>
@@ -95,26 +66,39 @@ @@ -95,26 +66,39 @@
95 new FastClick(document.body); 66 new FastClick(document.body);
96 </script> 67 </script>
97 <script type="text/javascript" src="../../assets/js/vue.min.js"></script> 68 <script type="text/javascript" src="../../assets/js/vue.min.js"></script>
  69 +<script type="text/javascript" src="../../assets/js/datePicker.js"></script>
98 <script> 70 <script>
  71 +
99 var app = new Vue({ 72 var app = new Vue({
100 el: '#app', 73 el: '#app',
101 - data: {  
102 - pickerValue: '',  
103 - endDate: new Date(),  
104 - startDate: new Date()  
105 - }, 74 + data: {},
106 created: function () { 75 created: function () {
107 - apiready = function () {  
108 - app.$refs.picker.open();  
109 - } 76 + // apiready=function () {
  77 + var calendar = new datePicker();
  78 + calendar.init({
  79 + 'trigger': '#sever', /*按钮选择器，用于触发弹出插件*/
  80 + 'type': 'date', /*模式：date日期；datetime日期时间；time时间；ym年月；*/
  81 + // 'minDate':getTimeDetil(3), /*最小日期*/
  82 + 'minDate': '', /*最小日期*/
  83 + 'maxDate': formatDate(new Date(), 1), /*最大日期*/
  84 + 'onSubmit': function () {/*确认时触发事件*/
  85 + api.sendEvent({
  86 + name: 'bro_time',
  87 + extra: {
  88 + broinfo: calendar.value
  89 + }
  90 + });
  91 + },
  92 + 'onClose': function () {/*取消时触发事件*/
  93 + api.closeWin();
  94 + }
  95 + });
  96 + document.getElementById('sever').click()
110 }, 97 },
111 methods: { 98 methods: {
112 - close: function () {  
113 - api.closeWin();  
114 - },  
115 - choose_bro: function () {  
116 - console.log(app.pickerValue)  
117 - }, 99 + // close: function () {
  100 + // api.closeWin();
  101 + // },
118 } 102 }
119 }) 103 })
120 </script> 104 </script>
@@ -82,9 +82,6 @@ @@ -82,9 +82,6 @@
82 w: 'auto', 82 w: 'auto',
83 h: 'auto' 83 h: 'auto'
84 }, 84 },
85 - pageParam: {  
86 -  
87 - }  
88 }); 85 });
89 } 86 }
90 }, 87 },
@@ -8,7 +8,8 @@ @@ -8,7 +8,8 @@
8 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no"> 8 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
9 <title></title> 9 <title></title>
10 <script src="../../assets/js/fontsize.js"></script> 10 <script src="../../assets/js/fontsize.js"></script>
11 - <!--<link rel="stylesheet" href="../../assets/css/weui.min.css">--> 11 + <link rel="stylesheet" href="../../assets/css/weui.min.css">
  12 + <link rel="stylesheet" href="../../assets/css/api.css">
12 <link rel="stylesheet" href="../../assets/icon/iconfont.css"> 13 <link rel="stylesheet" href="../../assets/icon/iconfont.css">
13 <style> 14 <style>
14 15
@@ -51,13 +52,14 @@ @@ -51,13 +52,14 @@
51 </head> 52 </head>
52 <body> 53 <body>
53 <div id="app" v-cloak> 54 <div id="app" v-cloak>
54 - <div class="meal" @click="close">  
55 - <div id="sever" >1</div> 55 + <div class="meal">
  56 + <input id="sever" autofocus placeholder="1" type="hidden">
56 </div> 57 </div>
57 </div> 58 </div>
58 </body> 59 </body>
59 </html> 60 </html>
60 <script type="text/javascript" src="../../assets/js/api.js"></script> 61 <script type="text/javascript" src="../../assets/js/api.js"></script>
  62 +<script type="text/javascript" src="../../assets/js/weui.min.js"></script>
61 <script type="text/javascript" src="../../assets/js/public.js"></script> 63 <script type="text/javascript" src="../../assets/js/public.js"></script>
62 <script type="text/javascript" src="../../assets/js/fastclick.js"></script> 64 <script type="text/javascript" src="../../assets/js/fastclick.js"></script>
63 <script> 65 <script>
@@ -66,7 +68,7 @@ @@ -66,7 +68,7 @@
66 <script type="text/javascript" src="../../assets/js/vue.min.js"></script> 68 <script type="text/javascript" src="../../assets/js/vue.min.js"></script>
67 <script type="text/javascript" src="../../assets/js/datePicker.js"></script> 69 <script type="text/javascript" src="../../assets/js/datePicker.js"></script>
68 <script> 70 <script>
69 - document.getElementById("sever").click(); 71 +
70 var app = new Vue({ 72 var app = new Vue({
71 el: '#app', 73 el: '#app',
72 data: { 74 data: {
@@ -75,37 +77,37 @@ @@ -75,37 +77,37 @@
75 startDate_sev: new Date('2019-01-22') 77 startDate_sev: new Date('2019-01-22')
76 }, 78 },
77 created: function () { 79 created: function () {
78 - apiready = function () {  
79 - api.addEventListener({  
80 - name: 'choose_sev'  
81 - }, function(ret, err) {  
82 - if(ret){  
83 - app.choose_sev()  
84 - }  
85 - });  
86 - } 80 + // apiready=function () {
  81 + var calendar = new datePicker();
  82 + calendar.init({
  83 + 'trigger': '#sever', /*按钮选择器，用于触发弹出插件*/
  84 + 'type': 'datetime', /*模式：date日期；datetime日期时间；time时间；ym年月；*/
  85 + // 'minDate':getTimeDetil(3), /*最小日期*/
  86 + 'minDate': formatDate(new Date(getTimeDetil(3)), 1), /*最小日期*/
  87 + 'maxDate': '', /*最大日期*/
  88 + 'onSubmit': function () {/*确认时触发事件*/
  89 + if (checkDate(calendar.value, 1)) {
  90 + api.sendEvent({
  91 + name: 'sev_time',
  92 + extra: {
  93 + dateinfo: calendar.value
  94 + }
  95 + });
  96 + } else {
  97 + alert('请选择3小时之后到7天之内的服务时间');
  98 + }
  99 +
  100 + },
  101 + 'onClose': function () {/*取消时触发事件*/
  102 + api.closeWin();
  103 + }
  104 + });
  105 + document.getElementById('sever').click()
87 }, 106 },
88 methods: { 107 methods: {
89 - close: function () {  
90 - // api.closeWin({  
91 - // name: 'choose_meal_w'  
92 - // });  
93 - api.closeWin();  
94 - },  
95 - choose_sev: function () {  
96 - var calendar = new datePicker();  
97 - calendar.init({  
98 - 'trigger': '#sever', /*按钮选择器，用于触发弹出插件*/  
99 - 'type': 'datetime', /*模式：date日期；datetime日期时间；time时间；ym年月；*/  
100 - 'minDate': '1900-1-1', /*最小日期*/  
101 - 'maxDate': formatDate(new Date()), /*最大日期*/  
102 - 'onSubmit': function () {/*确认时触发事件*/  
103 - console.log(calendar.value);  
104 - },  
105 - 'onClose': function () {/*取消时触发事件*/  
106 - }  
107 - });  
108 - }, 108 + // close: function () {
  109 + // api.closeWin();
  110 + // },
109 } 111 }
110 }) 112 })
111 </script> 113 </script>
@@ -63,11 +63,8 @@ @@ -63,11 +63,8 @@
63 }, 63 },
64 created: function () { 64 created: function () {
65 apiready = function () { 65 apiready = function () {
66 - app.attribute = api.pageParam.attribute;  
67 - app.id = api.pageParam.id;  
68 - app.unit = api.pageParam.unit;  
69 api.openFrame({ 66 api.openFrame({
70 - bgColor: 'rgba(0,0,0,0.02)', 67 + bgColor: 'rgba(0,0,0,0)',
71 name: 'getSev_f', 68 name: 'getSev_f',
72 url: './getSev_f.html', 69 url: './getSev_f.html',
73 bounces: false, 70 bounces: false,
@@ -164,7 +164,6 @@ @@ -164,7 +164,6 @@
164 }, 164 },
165 created: function () { 165 created: function () {
166 apiready = function () { 166 apiready = function () {
167 - app.getUserType();  
168 api.addEventListener({ 167 api.addEventListener({
169 name: 'city' 168 name: 'city'
170 }, function (ret, err) { 169 }, function (ret, err) {
@@ -329,33 +328,7 @@ @@ -329,33 +328,7 @@
329 } 328 }
330 }); 329 });
331 }, 330 },
332 - // 判断登录用户  
333 - getUserType: function () {  
334 - if (getToken()) {  
335 - var header = {  
336 - 'XX-Device-Type': getDevice(),  
337 - 'XX-Token': getToken()  
338 - };  
339 - getRequest('post', 'home/index/getUserType', null, header).then(function (res) {  
340 - if (res.data.code == 1) {  
341 - if (res.data.data.user_type == 3) {  
342 - api.openWin({  
343 - name: 'doctor_win',  
344 - url: '../doctor/doctor_win.html',  
345 - });  
346 - api.sendEvent({  
347 - name: 'doctor_index0',  
348 - extra: {  
349 - index: 0  
350 - }  
351 - });  
352 - }  
353 - } else {  
354 - toastMsg(res.data.msg)  
355 - }  
356 - });  
357 - }  
358 - } 331 +
359 } 332 }
360 }) 333 })
361 </script> 334 </script>
@@ -225,17 +225,11 @@ @@ -225,17 +225,11 @@
225 // 打开健康档案 225 // 打开健康档案
226 openHealth: function () { 226 openHealth: function () {
227 app.img_active = false; 227 app.img_active = false;
228 - api.openFrame({  
229 - name: 'my_health',  
230 - url: '../my/my_health.html',  
231 - rect: {  
232 - x: 0,  
233 - y: 0,  
234 - w: 'auto',  
235 - h: 'auto'  
236 - }, 228 + api.openWin({
  229 + name: 'my_health_w',
  230 + url: '../my/my_health_w.html',
237 pageParam: { 231 pageParam: {
238 - rid: 1 232 + rid: 0
239 } 233 }
240 }); 234 });
241 api.sendEvent({ 235 api.sendEvent({
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 }, 1000); 135 }, 1000);
136 }, 136 },
137 pay_money: function () { 137 pay_money: function () {
138 - openView('my_pay', 'my/my_pay', '订单支付') 138 + openView('my_pay', 'my/my_pay', '订单支付','my_pay',false,false,false)
139 } 139 }
140 } 140 }
141 }) 141 })
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 <div class="service_icon"><span class="iconfont icon-yonghu"></span><span>服务对象</span></div> 115 <div class="service_icon"><span class="iconfont icon-yonghu"></span><span>服务对象</span></div>
116 <div class="service_input"><input type="text" placeholder="请输入姓名" v-model.trim="user_name"></div> 116 <div class="service_input"><input type="text" placeholder="请输入姓名" v-model.trim="user_name"></div>
117 </div> 117 </div>
118 - <div class="service_input_box" @click.stop="dateSelect"> 118 + <div class="service_input_box" @click.stop="dateSelect" id="sever">
119 <div class="service_icon"><span class="iconfont icon-shijian1"></span><span>服务时间</span></div> 119 <div class="service_icon"><span class="iconfont icon-shijian1"></span><span>服务时间</span></div>
120 <div class="service_input"><span v-if="date_info" class="date_info">{{date_info}}</span><span v-else>{{default_date}}</span> 120 <div class="service_input"><span v-if="date_info" class="date_info">{{date_info}}</span><span v-else>{{default_date}}</span>
121 </div> 121 </div>
@@ -385,33 +385,47 @@ @@ -385,33 +385,47 @@
385 app.pos = 'fixed' 385 app.pos = 'fixed'
386 } 386 }
387 }, false); 387 }, false);
388 - 388 + api.addEventListener({
  389 + name: 'sev_time'
  390 + }, function (ret, err) {
  391 + if (ret) {
  392 + app.date_info = ret.value.dateinfo;
  393 + } else {
  394 + toastMsg('请重试')
  395 + }
  396 + });
  397 + api.addEventListener({
  398 + name: 'bro_time'
  399 + }, function (ret, err) {
  400 + if (ret) {
  401 + app.broth_info = ret.value.broinfo;
  402 + } else {
  403 + toastMsg('请重试')
  404 + }
  405 + });
389 // app.name=api.pageParam.name; 406 // app.name=api.pageParam.name;
390 } 407 }
391 }, 408 },
392 methods: { 409 methods: {
393 // 选择服务日期 410 // 选择服务日期
394 dateSelect: function () { 411 dateSelect: function () {
  412 +
395 api.openWin({ 413 api.openWin({
396 name: 'getSev_w', 414 name: 'getSev_w',
397 url: '../common/getSev_w.html' 415 url: '../common/getSev_w.html'
398 }); 416 });
399 - api.sendEvent({  
400 - name: 'choose_sev'  
401 - });  
402 }, 417 },
  418 +
403 // 选择生日 419 // 选择生日
404 broSelect: function () { 420 broSelect: function () {
405 api.openWin({ 421 api.openWin({
406 name: 'getBro_w', 422 name: 'getBro_w',
407 url: '../common/getBro_w.html' 423 url: '../common/getBro_w.html'
408 }) 424 })
409 - }  
410 -  
411 - , 425 + },
412 // 上传证明 426 // 上传证明
413 openProve: function () { 427 openProve: function () {
414 - openView('prove', 'index/prove', '上传就医证明') 428 + openView('prove', 'index/prove', '上传就医证明','prove',false,false,false)
415 } 429 }
416 , 430 ,
417 // 获取订单详情 431 // 获取订单详情
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 <meta http-equiv="X-UA-Compatible" content="ie=edge"> 7 <meta http-equiv="X-UA-Compatible" content="ie=edge">
8 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no"> 8 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
9 <script src="../../assets/js/fontsize.js"></script> 9 <script src="../../assets/js/fontsize.js"></script>
  10 + <link rel="stylesheet" href="../../assets/css/weui.min.css">
10 <link rel="stylesheet" href="../../assets/css/api.css"/> 11 <link rel="stylesheet" href="../../assets/css/api.css"/>
11 <link rel="stylesheet" href="../../assets/css/my_f.css"/> 12 <link rel="stylesheet" href="../../assets/css/my_f.css"/>
12 <link rel="stylesheet" href="../../assets/icon/iconfont.css"> 13 <link rel="stylesheet" href="../../assets/icon/iconfont.css">
@@ -67,6 +68,7 @@ @@ -67,6 +68,7 @@
67 </body> 68 </body>
68 </html> 69 </html>
69 <script type="text/javascript" src="../../assets/js/api.js"></script> 70 <script type="text/javascript" src="../../assets/js/api.js"></script>
  71 +<script type="text/javascript" src="../../assets/js/weui.min.js"></script>
70 <script type="text/javascript" src="../../assets/js/public.js"></script> 72 <script type="text/javascript" src="../../assets/js/public.js"></script>
71 <script type="text/javascript" src="../../assets/js/fastclick.js"></script> 73 <script type="text/javascript" src="../../assets/js/fastclick.js"></script>
72 <script> 74 <script>
@@ -81,7 +83,7 @@ @@ -81,7 +83,7 @@
81 data: { 83 data: {
82 isLogin: true, 84 isLogin: true,
83 // user_info: [], 85 // user_info: [],
84 - user_type: [], 86 + user_type: [1],
85 avatar_default: '../../assets/image/mblogo_03.png', 87 avatar_default: '../../assets/image/mblogo_03.png',
86 default_name: '', 88 default_name: '',
87 marginTop: '', 89 marginTop: '',
@@ -91,7 +93,7 @@ @@ -91,7 +93,7 @@
91 created: function () { 93 created: function () {
92 apiready = function () { 94 apiready = function () {
93 app.type = api.pageParam.type ? api.pageParam.type : 0; 95 app.type = api.pageParam.type ? api.pageParam.type : 0;
94 - // app.getUserinfo(); 96 + app.getUserIndexInfo()
95 if (getToken()) { 97 if (getToken()) {
96 app.getUserIndexInfo() 98 app.getUserIndexInfo()
97 app.getNews(); 99 app.getNews();
@@ -244,9 +246,9 @@ @@ -244,9 +246,9 @@
244 // alert(JSON.stringify(res)); 246 // alert(JSON.stringify(res));
245 if (res.data.code == 1) { 247 if (res.data.code == 1) {
246 app.user_type = res.data.data; 248 app.user_type = res.data.data;
247 - loadEnd();  
248 } else { 249 } else {
249 } 250 }
  251 + loadEnd()
250 }); 252 });
251 } 253 }
252 } 254 }
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 .health_menu { 240 .health_menu {
241 position: absolute; 241 position: absolute;
242 right: 0.42rem; 242 right: 0.42rem;
243 - top: 0.8rem; 243 + top: 1rem;
244 background-color: #fff; 244 background-color: #fff;
245 padding: 0.06rem 0; 245 padding: 0.06rem 0;
246 border-radius: 0.05rem; 246 border-radius: 0.05rem;
@@ -323,19 +323,19 @@ @@ -323,19 +323,19 @@
323 <div id="loadStart"></div> 323 <div id="loadStart"></div>
324 <div id="app"> 324 <div id="app">
325 <div class="health_head"> 325 <div class="health_head">
326 - <div class="health_top" :style="{top: top}">  
327 - <div @click="closeWindow()" class="close_left"><span class="iconfont icon-fanhui"></span></div>  
328 - <div class="health_mid" v-if="rid==0">健康档案</div>  
329 - <div class="health_mid" v-else>亲友档案</div>  
330 - <div class="index_right" @click="img_active=!img_active" v-if="rid==0">  
331 - <img src="../../assets/image/plus.png" alt="" :class="{img_transform:img_active}">  
332 - </div>  
333 - <div class="index_right" v-else></div>  
334 - <div class="health_menu" v-show="img_active">  
335 - <div class="health_item" @click="addPerson">添加亲友档案</div>  
336 - <div class="health_item" @click="openFriend">查看亲友档案</div>  
337 - </div>` 326 + <!--<div class="health_top" :style="{top: top}">-->
  327 + <!--<div @click="closeWindow()" class="close_left"><span class="iconfont icon-fanhui"></span></div>-->
  328 + <!--<div class="health_mid" v-if="rid==0">健康档案</div>-->
  329 + <!--<div class="health_mid" v-else>亲友档案</div>-->
  330 + <!--<div class="index_right" @click="img_active=!img_active" v-if="rid==0">-->
  331 + <!--<img src="../../assets/image/plus.png" alt="" :class="{img_transform:img_active}">-->
  332 + <!--</div>-->
  333 + <!--<div class="index_right" v-else></div>-->
  334 + <div class="health_menu" v-show="img_active">
  335 + <div class="health_item" @click="addPerson">添加亲友档案</div>
  336 + <div class="health_item" @click="openFriend">查看亲友档案</div>
338 </div> 337 </div>
  338 + <!--</div>-->
339 <div class="head_bgc"> 339 <div class="head_bgc">
340 <div class="circle"> 340 <div class="circle">
341 <div class="track"></div> 341 <div class="track"></div>
@@ -346,10 +346,10 @@ @@ -346,10 +346,10 @@
346 <div class="mask" :style="{opacity:mask_opacity}"></div> 346 <div class="mask" :style="{opacity:mask_opacity}"></div>
347 </div> 347 </div>
348 <div class="head_info"> 348 <div class="head_info">
349 - <span class="info_name clamp1">{{record_data.info.name?record_data.info.name:''}}</span> 349 + <span class="info_name clamp1">{{info.name?info.name:''}}</span>
350 <span class="info_sex"> 350 <span class="info_sex">
351 - {{record_data.info.sex}}，{{record_data.info.birthday?record_data.info.birthday:0}}岁</span>  
352 - <span class="info_pre">资料完整度{{record_data.complete}}%</span> 351 + {{info.sex}}，{{info.birthday?info.birthday:0}}岁</span>
  352 + <span class="info_pre">资料完整度{{record_data.complete?record_data.complete:0}}%</span>
353 </div> 353 </div>
354 </div> 354 </div>
355 </div> 355 </div>
@@ -426,9 +426,6 @@ @@ -426,9 +426,6 @@
426 }, 426 },
427 created: function () { 427 created: function () {
428 apiready = function () { 428 apiready = function () {
429 - if (getDevice() == 'iPhone10,3') {  
430 - app.top = 35 + 'px'  
431 - }  
432 app.rid = api.pageParam.rid; 429 app.rid = api.pageParam.rid;
433 app.type = api.pageParam.type ? api.pageParam.type : 0; 430 app.type = api.pageParam.type ? api.pageParam.type : 0;
434 app.record(); 431 app.record();
@@ -445,6 +442,11 @@ @@ -445,6 +442,11 @@
445 app.record(); 442 app.record();
446 app.getHeathlyRecord(); 443 app.getHeathlyRecord();
447 }); 444 });
  445 + api.addEventListener({
  446 + name: 'showlist'
  447 + }, function (ret, err) {
  448 + app.img_active = ret.value.img_active;
  449 + });
448 } 450 }
449 }, 451 },
450 methods: { 452 methods: {
@@ -471,11 +473,23 @@ @@ -471,11 +473,23 @@
471 // 添加亲友 473 // 添加亲友
472 addPerson: function () { 474 addPerson: function () {
473 app.img_active = false; 475 app.img_active = false;
  476 + api.sendEvent({
  477 + name: 'hidelist',
  478 + extra: {
  479 + img_active:app.img_active
  480 + }
  481 + });
474 openView('my_detail', 'my/my_detail', '添加亲友档案', 'my_detail', false, {type: 1, rid: app.rid}) 482 openView('my_detail', 'my/my_detail', '添加亲友档案', 'my_detail', false, {type: 1, rid: app.rid})
475 }, 483 },
476 // 健康数据 484 // 健康数据
477 openData: function () { 485 openData: function () {
478 app.img_active = false; 486 app.img_active = false;
  487 + api.sendEvent({
  488 + name: 'hidelist',
  489 + extra: {
  490 + img_active:app.img_active
  491 + }
  492 + });
479 openView('my_healthData', 'my/my_healthData', '健康数据', 'my_healthData', false, {rid: app.rid}) 493 openView('my_healthData', 'my/my_healthData', '健康数据', 'my_healthData', false, {rid: app.rid})
480 }, 494 },
481 // 健康史 495 // 健康史
@@ -486,7 +500,7 @@ @@ -486,7 +500,7 @@
486 // 亲友档案 500 // 亲友档案
487 openFriend: function () { 501 openFriend: function () {
488 app.img_active = false; 502 app.img_active = false;
489 - openView('my_fri', 'my/my_fri', '亲友健康档案'); 503 + openView('my_fri', 'my/my_fri', '亲友健康档案', 'my_fri', false, false, false);
490 }, 504 },
491 // 获取个人档案完善情况 505 // 获取个人档案完善情况
492 record: function () { 506 record: function () {
@@ -501,6 +515,7 @@ @@ -501,6 +515,7 @@
501 // alert(JSON.stringify(res)) 515 // alert(JSON.stringify(res))
502 if (res.data.code == 1) { 516 if (res.data.code == 1) {
503 app.record_data = res.data.data; 517 app.record_data = res.data.data;
  518 + app.info = res.data.data.info;
504 app.percent = parseInt(app.record_data.complete); 519 app.percent = parseInt(app.record_data.complete);
505 if (app.percent < 50) { 520 if (app.percent < 50) {
506 app.left = 3.6 * app.percent; 521 app.left = 3.6 * app.percent;
  1 +<!doctype html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <meta name="viewport"
  6 + content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
  7 + <meta http-equiv="X-UA-Compatible" content="ie=edge">
  8 + <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
  9 + <script src="../../assets/js/fontsize.js"></script>
  10 + <link rel="stylesheet" href="../../assets/css/api.css"/>
  11 + <link rel="stylesheet" href="../../assets/css/index.css">
  12 + <link rel="stylesheet" href="../../assets/css/doc.css">
  13 + <link rel="stylesheet" href="../../assets/icon/iconfont.css">
  14 + <style>
  15 + .health_head {
  16 + background-color: #dbb25f;
  17 + display: flex;
  18 + align-items: center;
  19 + justify-content: center;
  20 + padding-top: 20px;
  21 + position: relative;
  22 + /*overflow: hidden;*/
  23 + }
  24 +
  25 + .health_top {
  26 + display: flex;
  27 + align-items: center;
  28 + justify-content: space-between;
  29 + padding: 0.29rem 0.42rem;
  30 + font-size: 15px;
  31 + color: #fff;
  32 + position: absolute;
  33 + left: 0;
  34 + top: 0;
  35 + /*top: 20px;*/
  36 + width: 100%;
  37 + z-index: 9999;
  38 + background-color: #dbb25f;
  39 + /*overflow: hidden;*/
  40 + }
  41 +
  42 + .health_top div {
  43 + flex: 1;
  44 + }
  45 +
  46 + .head_bgc {
  47 + width: 145px;
  48 + height: 145px;
  49 + border-radius: 50%;
  50 + display: flex;
  51 + align-items: center;
  52 + justify-content: center;
  53 + position: relative;
  54 + }
  55 +
  56 + .head_info {
  57 + background-image: url("../../assets/image/head_bgc.png");
  58 + background-size: cover;
  59 + display: flex;
  60 + flex-direction: column;
  61 + align-items: center;
  62 + justify-content: center;
  63 + text-align: center;
  64 + position: absolute;
  65 + left: 0;
  66 + right: 0;
  67 + top: 0;
  68 + bottom: 0;
  69 + z-index: 10;
  70 + }
  71 +
  72 + .info_name {
  73 + font-size: 18px;
  74 + color: #A6894B;
  75 + width: 1.2rem;
  76 + }
  77 +
  78 + .info_sex {
  79 + font-size: 12px;
  80 + color: #A58541;
  81 + }
  82 +
  83 + .info_pre {
  84 + font-size: 10px;
  85 + color: #C2A25E;
  86 + }
  87 +
  88 + .icon-yiliao {
  89 + font-size: 18px;
  90 + }
  91 +
  92 + .header_info_item {
  93 + font-size: 14px;
  94 + color: #525254;
  95 + display: flex;
  96 + align-items: center;
  97 + justify-content: space-between;
  98 + padding: 0.15rem 0.5rem;
  99 + border-bottom: 0.01rem solid #efefef;
  100 + }
  101 +
  102 + .header_info_item:active {
  103 + background-color: rgba(0, 0, 0, 0.1);
  104 + }
  105 +
  106 + .header_info_item img {
  107 + width: 0.35rem;
  108 + margin-right: 0.16rem;
  109 + }
  110 +
  111 + .header_info_img {
  112 + display: flex;
  113 + align-items: center;
  114 + }
  115 +
  116 + .icon-xiangyou {
  117 + margin-left: 0.14rem;
  118 + }
  119 +
  120 + .life {
  121 + background-color: #f1f1f1;
  122 + }
  123 +
  124 + .life_list {
  125 + padding: 0.46rem;
  126 + }
  127 +
  128 + .life_item {
  129 + display: flex;
  130 + font-size: 11px;
  131 + }
  132 +
  133 + .life_left {
  134 + width: 2rem;
  135 + }
  136 +
  137 + .life_right {
  138 + padding: 0 0.28rem;
  139 + border-left: 2px solid #dbb25f;
  140 + padding-bottom: 0.5rem;
  141 + position: relative;
  142 + flex: 1;
  143 + }
  144 +
  145 + .life_right_item {
  146 + padding: 0.1rem 0 0.1rem 0.44rem;
  147 + background-color: #dbb25f;
  148 + color: #fff;
  149 + border: 1px solid #dbb25f;
  150 + margin: 0 0 0 0.5rem;
  151 + }
  152 +
  153 + .life_right_bottom {
  154 + border: 1px solid #dbb25f;
  155 + padding: 0.17rem 0.3rem;
  156 + margin: 0 0 0 0.5rem;
  157 + }
  158 +
  159 + .life_circle {
  160 + width: 0.4rem;
  161 + height: 0.4rem;
  162 + border-radius: 50%;
  163 + background-color: #e5cb94;
  164 + position: absolute;
  165 + left: -0.2rem;
  166 + z-index: 2;
  167 + top: 0.1rem;
  168 + display: flex;
  169 + align-items: center;
  170 + justify-content: center;
  171 + }
  172 +
  173 + .life_circle_item {
  174 + width: 0.25rem;
  175 + height: 0.25rem;
  176 + border-radius: 50%;
  177 + background-color: #ddbb37;
  178 + }
  179 +
  180 + .life_tri {
  181 + width: 0;
  182 + height: 0;
  183 + border-top: 0.15rem solid transparent;
  184 + border-right: 0.3rem solid #ddbb73;
  185 + border-bottom: 0.15rem solid transparent;
  186 + position: relative;
  187 + left: -0.75rem;
  188 + }
  189 +
  190 + .tans {
  191 + transform: rotate(0deg);
  192 + transition: 0.2s;
  193 + }
  194 +
  195 + .tanss {
  196 + transition: 0.2s;
  197 + transform: rotate(90deg);
  198 + }
  199 +
  200 + .icon-xiangyou {
  201 + color: #7E725D;
  202 + margin-left: 0.14rem;
  203 + }
  204 +
  205 + .index_right {
  206 + display: flex;
  207 + align-items: center;
  208 + justify-content: flex-end;
  209 + /*text-align: center;*/
  210 + position: relative;
  211 + text-align: right;
  212 + }
  213 +
  214 + .index_right:before {
  215 + position: absolute;
  216 + left: -0.1rem;
  217 + right: -0.1rem;
  218 + top: -0.1rem;
  219 + bottom: -0.1rem;
  220 + content: '';
  221 + }
  222 +
  223 + .img_transform {
  224 + transform: rotate(45deg);
  225 + }
  226 +
  227 + .index_right .icon-yiliao {
  228 + /*font-size: 25px;*/
  229 + }
  230 +
  231 + .health_mid {
  232 + /*padding-left: 0.5rem;*/
  233 + text-align: center;
  234 + }
  235 +
  236 + .index_right img {
  237 + height: 0.44rem;
  238 + }
  239 +
  240 + .health_menu {
  241 + position: absolute;
  242 + right: 0.42rem;
  243 + top: 0.8rem;
  244 + background-color: #fff;
  245 + padding: 0.06rem 0;
  246 + border-radius: 0.05rem;
  247 + z-index: 30;
  248 + }
  249 +
  250 + .health_item {
  251 + border-bottom: 1px solid #eeeeee;
  252 + padding: 0.06rem 0.12rem;
  253 + font-size: 13px;
  254 + color: #434A54;
  255 + }
  256 +
  257 + .circle {
  258 + position: relative;
  259 + width: 130px;
  260 + height: 130px;
  261 + text-align: center;
  262 + display: flex;
  263 + align-items: center;
  264 + justify-content: center;
  265 + }
  266 +
  267 + .circle .track, .circle .left, .circle .right, .circle .mask {
  268 + width: 108px;
  269 + height: 108px;
  270 + position: absolute;
  271 + top: 0;
  272 + left: 0;
  273 + bottom: 0;
  274 + right: 0;
  275 + margin: auto;
  276 + border-radius: 50%;
  277 + border: 0.15rem #dbb25f solid;
  278 + -webkit-box-sizing: border-box;
  279 + -moz-box-sizing: border-box;
  280 + box-sizing: border-box;
  281 + z-index: 20;
  282 + }
  283 +
  284 + .circle .mask, .circle .left, .circle .right {
  285 + clip: rect(0 54px 108px 0);
  286 + }
  287 +
  288 + .circle .left, .circle .right {
  289 + border-color: #C2A25E;
  290 + }
  291 +
  292 + /*.circle .left {*/
  293 + /*border-color: #0bb20c;*/
  294 + /*background-color: #222222;*/
  295 + /*}*/
  296 +
  297 + /*.circle .right {*/
  298 + /*border-color: #ce3c39;*/
  299 + /*background-color: #f2f2f2;*/
  300 + /*}*/
  301 +
  302 + .circle .right {
  303 + opacity: 0;
  304 + -webkit-transform: rotate(180deg);
  305 + -moz-transform: rotate(180deg);
  306 + -ms-transform: rotate(180deg);
  307 + -o-transform: rotate(180deg);
  308 + transform: rotate(180deg);
  309 + }
  310 +
  311 + /* 进度显示文字样式 */
  312 +
  313 + .transition-rotate {
  314 + -webkit-transition: transform 3s ease-in-out;
  315 + -moz-transition: transform 3s ease-in-out;
  316 + -ms-transition: transform 3s ease-in-out;
  317 + -o-transition: transform 3s ease-in-out;
  318 + transition: transform 3s ease-in-out;
  319 + }
  320 + </style>
  321 +</head>
  322 +<body>
  323 +<div id="app" v-cloak>
  324 + <header id="header">
  325 + <div class="health_top">
  326 + <div @click="closeWindow()" class="close_left"><span class="iconfont icon-fanhui"></span></div>
  327 + <div class="health_mid" v-if="rid==0">健康档案</div>
  328 + <div class="health_mid" v-else>亲友档案</div>
  329 + <div class="index_right" @click="show_list" v-if="rid==0">
  330 + <img src="../../assets/image/plus.png" alt="" :class="{img_transform:img_active}">
  331 + </div>
  332 + <div class="index_right" v-else></div>
  333 + </div>
  334 + </header>
  335 +</div>
  336 +</body>
  337 +</html>
  338 +<script type="text/javascript" src="../../assets/js/api.js"></script>
  339 +<script type="text/javascript" src="../../assets/js/public.js"></script>
  340 +<script type="text/javascript" src="../../assets/js/fastclick.js"></script>
  341 +<script>
  342 + new FastClick(document.body);
  343 +</script>
  344 +<script type="text/javascript" src="../../assets/js/vue.min.js"></script>
  345 +<script type="text/javascript" src="../../assets/js/axios.min.js"></script>
  346 +<script type="text/javascript" src="../../assets/icon/iconfont.js"></script>
  347 +<script>
  348 + var app = new Vue({
  349 + el: '#app',
  350 + data: {
  351 + img_active: false,
  352 + headerH: '',
  353 + rid: '',
  354 + type: ''
  355 + },
  356 + created: function () {
  357 + apiready = function () {
  358 + app.rid = api.pageParam.rid;
  359 + app.type = api.pageParam.type ? api.pageParam.type : 0;
  360 + app.headerH = $api.offset($api.dom('header')).h;
  361 + api.openFrame({
  362 + name: 'my_health',
  363 + url: './my_health.html',
  364 + // bounces: true,
  365 + rect: {
  366 + x: 0,
  367 + y: app.headerH,
  368 + w: api.frameWidth,
  369 + h: api.winHeight - app.headerH
  370 + },
  371 + pageParam: {
  372 + rid: app.rid,
  373 + type: app.type
  374 + }
  375 + });
  376 + api.addEventListener({
  377 + name: 'hidelist'
  378 + }, function (ret, err) {
  379 + app.img_active = ret.value.img_active
  380 + });
  381 + }
  382 + },
  383 + methods: {
  384 + show_list: function () {
  385 + app.img_active = !app.img_active;
  386 + api.sendEvent({
  387 + name: 'showlist',
  388 + extra: {
  389 + img_active: app.img_active
  390 + }
  391 + });
  392 + }
  393 + }
  394 + })
  395 +</script>
@@ -224,7 +224,7 @@ @@ -224,7 +224,7 @@
224 name: 'cancel_order', 224 name: 'cancel_order',
225 }); 225 });
226 setTimeout(res => { 226 setTimeout(res => {
227 - openView('my_orderlist', 'my/my_orderlist', '我的订单') 227 + openView('my_orderlist', 'my/my_orderlist', '我的订单','',false,false,false)
228 }, 2000); 228 }, 2000);
229 } else { 229 } else {
230 toastMsg(res.data.msg) 230 toastMsg(res.data.msg)
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 if (res.data.code == 1) { 184 if (res.data.code == 1) {
185 toastMsg(res.data.msg); 185 toastMsg(res.data.msg);
186 setTimeout(res => { 186 setTimeout(res => {
187 - openView('my_orderlist', 'my/my_orderlist', '我的订单') 187 + openView('my_orderlist', 'my/my_orderlist', '我的订单','my_orderlist',false,false,false)
188 }, 2000); 188 }, 2000);
189 api.sendEvent({ 189 api.sendEvent({
190 name: 'cancel_order', 190 name: 'cancel_order',
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
323 if (res.data.code == 1) { 323 if (res.data.code == 1) {
324 toastMsg(res.data.msg); 324 toastMsg(res.data.msg);
325 setTimeout(res => { 325 setTimeout(res => {
326 - openView('my_orderlist', 'my/my_orderlist', '我的订单') 326 + openView('my_orderlist', 'my/my_orderlist', '我的订单','my_orderlist',false,false,false)
327 }, 2000); 327 }, 2000);
328 api.sendEvent({ 328 api.sendEvent({
329 name: 'cancel_order', 329 name: 'cancel_order',
@@ -417,7 +417,7 @@ @@ -417,7 +417,7 @@
417 if (res.data.code == 1) { 417 if (res.data.code == 1) {
418 toastMsg('退款成功'); 418 toastMsg('退款成功');
419 setTimeout(function () { 419 setTimeout(function () {
420 - openView('my_orderlist', 'my/my_orderlist', '我的订单') 420 + openView('my_orderlist', 'my/my_orderlist', '我的订单','my_orderlist',false,false,false)
421 }, 2000); 421 }, 2000);
422 api.sendEvent({ 422 api.sendEvent({
423 name:'re_money' 423 name:'re_money'
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <span>{{order_info.order_type}}</span> 70 <span>{{order_info.order_type}}</span>
71 </div> 71 </div>
72 <div class="pay_detail"> 72 <div class="pay_detail">
73 - <div class="pay_detail_item"> 73 + <div class="pay_detail_item">
74 <span class="iconfont icon-xingbie"></span> 74 <span class="iconfont icon-xingbie"></span>
75 <span class="pay_detail_label">投保金额</span> 75 <span class="pay_detail_label">投保金额</span>
76 <span>￥8868</span> 76 <span>￥8868</span>
@@ -233,25 +233,14 @@ @@ -233,25 +233,14 @@
233 // toastMsg(res.data.msg); 233 // toastMsg(res.data.msg);
234 api.hideProgress(); 234 api.hideProgress();
235 toastMsg(res.data.msg); 235 toastMsg(res.data.msg);
236 - setTimeout(res => {  
237 - openView('my_orderlist', 'my/my_orderlist', '我的订单') 236 + setTimeout(function () {
  237 + openView('my_orderlist', 'my/my_orderlist', '我的订单','my_orderlist',false,false,false)
238 }, 2000) 238 }, 2000)
239 } else { 239 } else {
240 toastMsg(res.data.msg) 240 toastMsg(res.data.msg)
241 } 241 }
242 }); 242 });
243 }, 243 },
244 - // 去详情页  
245 - // go_detail:function (id) {  
246 - // api.openWin({  
247 - // name: 'care_w',  
248 - // url: '../index/care_w.html',  
249 - // pageParam: {  
250 - // id: id,  
251 - // cid: app.cid,  
252 - // }  
253 - // })  
254 - // }  
255 } 244 }
256 }) 245 })
257 </script> 246 </script>
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 <span class="order_label">{{item.name}}</span> 129 <span class="order_label">{{item.name}}</span>
130 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div> 130 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div>
131 <div class="order_time"> 131 <div class="order_time">
132 - <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div> 132 + <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div>
133 <div v-else>预约服务时间：{{item.service_time}}</div> 133 <div v-else>预约服务时间：{{item.service_time}}</div>
134 </div> 134 </div>
135 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div> 135 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div>
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 <span class="order_label">{{item.name}}</span> 146 <span class="order_label">{{item.name}}</span>
147 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div> 147 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div>
148 <div class="order_time"> 148 <div class="order_time">
149 - <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div> 149 + <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div>
150 <div v-else>预约服务时间：{{item.service_time}}</div> 150 <div v-else>预约服务时间：{{item.service_time}}</div>
151 </div> 151 </div>
152 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div> 152 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div>
@@ -163,7 +163,7 @@ @@ -163,7 +163,7 @@
163 <span class="order_label">{{item.name}}</span> 163 <span class="order_label">{{item.name}}</span>
164 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div> 164 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div>
165 <div class="order_time"> 165 <div class="order_time">
166 - <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div> 166 + <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div>
167 <div v-else>预约服务时间：{{item.service_time}}</div> 167 <div v-else>预约服务时间：{{item.service_time}}</div>
168 </div> 168 </div>
169 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div> 169 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div>
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 <span class="order_label">{{item.name}}</span> 181 <span class="order_label">{{item.name}}</span>
182 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div> 182 <div class="order_content clamp1">【{{item.post_title}}】{{item.other_title}}</div>
183 <div class="order_time"> 183 <div class="order_time">
184 - <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div> 184 + <div v-if="item.goods_type==2||item.goods_type==4">下单时间：{{item.addtime}}</div>
185 <div v-else>预约服务时间：{{item.service_time}}</div> 185 <div v-else>预约服务时间：{{item.service_time}}</div>
186 </div> 186 </div>
187 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div> 187 <div class="order_total"><span>合计：</span><span class="total_num">￥{{item.price}}</span></div>
@@ -208,7 +208,12 @@ @@ -208,7 +208,12 @@
208 paying: false, 208 paying: false,
209 pay: false, 209 pay: false,
210 paied: false, 210 paied: false,
211 - myOrder_data: {} 211 + myOrder_data: {
  212 + all: [],
  213 + complete: [],
  214 + unpay: [],
  215 + doing: []
  216 + }
212 }, 217 },
213 created: function () { 218 created: function () {
214 apiready = function () { 219 apiready = function () {
@@ -227,25 +232,13 @@ @@ -227,25 +232,13 @@
227 app.myOrder(); 232 app.myOrder();
228 } 233 }
229 }); 234 });
230 - api.setRefreshHeaderInfo({  
231 - // loadingImg: 'widget://assets/image/head.png',  
232 - loadingImg: 'widget://assets/image/loading.gif',  
233 - bgColor: '#fff',  
234 - textColor: '#d8b25f',  
235 - textDown: '下拉刷新...',  
236 - textUp: '松开刷新...'  
237 - }, function (ret, err) {  
238 - app.myOrder_data.all = [];  
239 - app.myOrder();  
240 - api.refreshHeaderLoadDone()  
241 - });  
242 } 235 }
243 }, 236 },
244 methods: { 237 methods: {
245 // 去详情页 238 // 去详情页
246 go_detail: function (order_id, order_type, goods_type) { 239 go_detail: function (order_id, order_type, goods_type) {
247 // alert(goods_type); 240 // alert(goods_type);
248 - if (goods_type == 2 ) { 241 + if (goods_type == 2) {
249 openView('my_order', 'my/my_order', '订单详情', 'my_order', false, { 242 openView('my_order', 'my/my_order', '订单详情', 'my_order', false, {
250 order_id: order_id, 243 order_id: order_id,
251 order_type: order_type 244 order_type: order_type
@@ -257,7 +250,7 @@ @@ -257,7 +250,7 @@
257 order_type: order_type 250 order_type: order_type
258 }) 251 })
259 } 252 }
260 - else if(goods_type==4){ 253 + else if (goods_type == 4) {
261 openView('my_order_ben', 'my/my_order_ben', '订单详情', 'my_order_ben', false, { 254 openView('my_order_ben', 'my/my_order_ben', '订单详情', 'my_order_ben', false, {
262 order_id: order_id, 255 order_id: order_id,
263 order_type: order_type 256 order_type: order_type
@@ -303,7 +296,10 @@ @@ -303,7 +296,10 @@
303 getRequest('post', 'user/Order/myOrder', null, header).then(function (res) { 296 getRequest('post', 'user/Order/myOrder', null, header).then(function (res) {
304 // alert(JSON.stringify(res)); 297 // alert(JSON.stringify(res));
305 if (res.data.code == 1) { 298 if (res.data.code == 1) {
306 - app.myOrder_data = res.data.data; 299 + app.myOrder_data.all = res.data.data.all;
  300 + app.myOrder_data.unpay = res.data.data.unpay;
  301 + app.myOrder_data.doing = res.data.data.doing;
  302 + app.myOrder_data.complete = res.data.data.complete;
307 loadEnd() 303 loadEnd()
308 } else { 304 } else {
309 toastMsg(res.data.msg) 305 toastMsg(res.data.msg)
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 if (res.data.code == 1) { 238 if (res.data.code == 1) {
239 toastMsg('提交成功'); 239 toastMsg('提交成功');
240 setTimeout(function () { 240 setTimeout(function () {
241 - openView('my_orderlist', 'my/my_orderlist', '我的订单') 241 + openView('my_orderlist', 'my/my_orderlist', '我的订单','my_orderlist',false,false,false)
242 }, 2000) 242 }, 2000)
243 } else { 243 } else {
244 // toastMsg(res.data.msg) 244 // toastMsg(res.data.msg)
@@ -249,7 +249,7 @@ @@ -249,7 +249,7 @@
249 </div> 249 </div>
250 <div class="set_item"> 250 <div class="set_item">
251 <div><span class="iconfont icon-jiejuefangan"></span><span>服务项目</span></div> 251 <div><span class="iconfont icon-jiejuefangan"></span><span>服务项目</span></div>
252 - <div>{{serverReport_list.server_name}}</div> 252 + <div>{{serverReport_list.title}}</div>
253 </div> 253 </div>
254 <div class="set_item border0"> 254 <div class="set_item border0">
255 <div> 255 <div>
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 }, 138 },
139 // 修改密码 139 // 修改密码
140 forget: function () { 140 forget: function () {
141 - openView('forgot_f', 'login/forgot_f', '修改密码') 141 + openView('forgot_f', 'login/forgot_f', '修改密码','forgot_f',false,false,false)
142 }, 142 },
143 // 清除缓存 143 // 清除缓存
144 clear_ache: function () { 144 clear_ache: function () {
@@ -152,26 +152,14 @@ @@ -152,26 +152,14 @@
152 // 退出登录 152 // 退出登录
153 login_out: function () { 153 login_out: function () {
154 $api.rmStorage('token'); 154 $api.rmStorage('token');
155 - openView('login_index', 'login/login_index', '登录'); 155 + openView('login_index', 'login/login_index', '登录','login_index',false,false,false);
156 window.location.reload() 156 window.location.reload()
157 }, 157 },
158 // 关于我们 158 // 关于我们
159 about_us: function () { 159 about_us: function () {
160 - openView('my_about', 'my/my_about', '关于我们') 160 + openView('my_about', 'my/my_about', '关于我们','my_about',false,false,false)
161 }, 161 },
162 - // 去医护端  
163 - // provider: function () {  
164 - // api.openWin({  
165 - // name: 'doctor_win',  
166 - // url: '../doctor/doctor_win.html',  
167 - // });  
168 - // api.sendEvent({  
169 - // name: 'doctor_index0',  
170 - // extra: {  
171 - // index: 0  
172 - // }  
173 - // });  
174 - // }, 162 +
175 // 拨打客服电话 163 // 拨打客服电话
176 callNumber: function () { 164 callNumber: function () {
177 api.call({ 165 api.call({