丁玲 / A6079080424317 · 提交

转到一个项目

作者 朱振飞
提交 dc193acfc87bd9bbd52f86e8fc87fcf8d55ec445 1 个父辈 7417a0a7

逻辑修改

内嵌 并排对比
正在显示 25 个修改的文件 包含 367 行增加 和 410 行删除
@@ -38,14 +38,14 @@ @@ -38,14 +38,14 @@
38 display: flex; 38 display: flex;
39 align-items: center; 39 align-items: center;
40 justify-content: space-between; 40 justify-content: space-between;
41 - background-color: #fff; 41 + background-color: #FFF;
42 width: 100%; 42 width: 100%;
43 position: fixed; 43 position: fixed;
44 bottom: 0; 44 bottom: 0;
45 left: 0; 45 left: 0;
46 padding: 0 0 0 0.41rem; 46 padding: 0 0 0 0.41rem;
47 font-size: 13px; 47 font-size: 13px;
48 - z-index: 0; 48 + z-index: 2;
49 } 49 }
50 50
51 .doc_left { 51 .doc_left {
@@ -423,7 +423,6 @@ footer { @@ -423,7 +423,6 @@ footer {
423 display: flex; 423 display: flex;
424 align-items: center; 424 align-items: center;
425 justify-content: center; 425 justify-content: center;
426 - margin-bottom: 0.15rem;  
427 } 426 }
428 427
429 .nurse_text { 428 .nurse_text {
@@ -623,14 +622,14 @@ html,body{ @@ -623,14 +622,14 @@ html,body{
623 height: 100%; 622 height: 100%;
624 } 623 }
625 #app { 624 #app {
626 - height: 100%;  
627 - display: flex;  
628 - display: -webkit-flex;  
629 - display: -webkit-box;  
630 - flex-flow: column;  
631 - -webkit-flex-flow: column;  
632 - -webkit-box-orient: vertical;  
633 - overflow-x: hidden; 625 + /*height: 100%;*/
  626 + /*display: flex;*/
  627 + /*display: -webkit-flex;*/
  628 + /*display: -webkit-box;*/
  629 + /*flex-flow: column;*/
  630 + /*-webkit-flex-flow: column;*/
  631 + /*-webkit-box-orient: vertical;*/
  632 + /*overflow-x: hidden;*/
634 } 633 }
635 634
636 .warp { 635 .warp {
@@ -241,5 +241,6 @@ @@ -241,5 +241,6 @@
241 241
242 .icon-Fill:before { content: "\e630"; } 242 .icon-Fill:before { content: "\e630"; }
243 243
244 -  
245 - 244 +#app{
  245 + -webkit-overflow-scrolling:touch;
  246 +}
@@ -246,10 +246,8 @@ $(function () { @@ -246,10 +246,8 @@ $(function () {
246 246
247 // jQuery plugin 247 // jQuery plugin
248 $.fn.knob = $.fn.dial = function (gopt) { 248 $.fn.knob = $.fn.dial = function (gopt) {
249 -  
250 return this.each( 249 return this.each(
251 function () { 250 function () {
252 -  
253 var $this = $(this), opt; 251 var $this = $(this), opt;
254 252
255 if ($this.data('dialed')) { 253 if ($this.data('dialed')) {
@@ -377,7 +377,6 @@ function getRequest(type, url, params, header) { @@ -377,7 +377,6 @@ function getRequest(type, url, params, header) {
377 loadEnd(); 377 loadEnd();
378 // resolve(res) 378 // resolve(res)
379 }).catch(function (err) { 379 }).catch(function (err) {
380 - console.log(121212)  
381 toastMsg('网络错误'); 380 toastMsg('网络错误');
382 // openView('wrong', 'common/wrong', '网络错误', 'wrong', false, false, false); 381 // openView('wrong', 'common/wrong', '网络错误', 'wrong', false, false, false);
383 // alert(JSON.stringify(err)) 382 // alert(JSON.stringify(err))
@@ -449,4 +448,3 @@ function escape2Html(str) { @@ -449,4 +448,3 @@ function escape2Html(str) {
449 return arrEntities[t]; 448 return arrEntities[t];
450 }); 449 });
451 } 450 }
452 -  
@@ -82,32 +82,41 @@ @@ -82,32 +82,41 @@
82 name: '', 82 name: '',
83 goods: [], 83 goods: [],
84 related_service: [], 84 related_service: [],
85 - introduce: [], 85 + introduce: []
86 }, 86 },
87 created: function () { 87 created: function () {
88 - apiready = function () {  
89 - app.cid = api.pageParam.cid;  
90 - app.getInsurance();  
91 - api.setFrameAttr({  
92 - name: 'Insurance',  
93 - bounces: true  
94 - });  
95 - } 88 + this.cid = localStorage.getItem('cid');
  89 + this.getInsurance();
  90 +
96 }, 91 },
97 methods: { 92 methods: {
98 openDoc: function (care_name, id, url) { 93 openDoc: function (care_name, id, url) {
99 - api.openWin({  
100 - name: 'care_w',  
101 - url: './insurance_detial.html',  
102 - pageParam: {  
103 - id: id,  
104 - cid: app.id,  
105 - url:escape2Html(url),  
106 - name: care_name  
107 - }  
108 - }) 94 + var app = this;
  95 + if(url){
  96 + openWin({
  97 + name: 'care_w',
  98 + url: './insurance_detial.html',
  99 + pageParam: {
  100 + id: id,
  101 + cid: app.cid,
  102 + url: escape2Html(url),
  103 + name: care_name
  104 + }
  105 + })
  106 + }else{
  107 + openWin({
  108 + name: 'care_w',
  109 + url: './care_f.html',
  110 + pageParam: {
  111 + id: id,
  112 + cid: app.cid
  113 + }
  114 + })
  115 + }
  116 +
109 }, 117 },
110 getInsurance: function () { 118 getInsurance: function () {
  119 + var app = this;
111 var header = { 120 var header = {
112 "XX-Device-Type": getDevice(), 121 "XX-Device-Type": getDevice(),
113 'XX-Token': getToken() 122 'XX-Token': getToken()
@@ -203,8 +203,8 @@ @@ -203,8 +203,8 @@
203 }, 203 },
204 // 去常见问题 204 // 去常见问题
205 question: function () { 205 question: function () {
206 - var app = this  
207 - openView('my_que', 'my/my_que', '常见问题', 'my_que', false, { 206 + var app = this;
  207 + openView('my_que', '../my/my_que', '常见问题', 'my_que', false, {
208 id: app.id 208 id: app.id
209 }) 209 })
210 }, 210 },
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 }, 109 },
110 methods: { 110 methods: {
111 getDoctor: function () { 111 getDoctor: function () {
112 - var that = this 112 + var that = this;
113 var header = { 113 var header = {
114 "XX-Device-Type": getDevice(), 114 "XX-Device-Type": getDevice(),
115 'XX-Token': getToken() 115 'XX-Token': getToken()
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 }, 135 },
136 // 去预约 136 // 去预约
137 go_home: function () { 137 go_home: function () {
138 - openView('doc_package_f', 'index/doc_package_f', app.post_title, 'doc_package_f', false, { 138 + openView('doc_package_f', '../index/doc_package_f', app.post_title, 'doc_package_f', false, {
139 id: app.id, 139 id: app.id,
140 cid: app.cid 140 cid: app.cid
141 }) 141 })
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 }, 179 },
180 // 获取个人的基本信息 180 // 获取个人的基本信息
181 getUserIndexInfo: function () { 181 getUserIndexInfo: function () {
182 - var app = this 182 + var app = this ;
183 var header = { 183 var header = {
184 "XX-Device-Type": getDevice(), 184 "XX-Device-Type": getDevice(),
185 'XX-Token': getToken() 185 'XX-Token': getToken()
@@ -194,7 +194,7 @@ @@ -194,7 +194,7 @@
194 }, 194 },
195 // 获取客服token 195 // 获取客服token
196 getRongYunToken: function () { 196 getRongYunToken: function () {
197 - var app = this 197 + var app = this;
198 var header = { 198 var header = {
199 "XX-Device-Type": getDevice(), 199 "XX-Device-Type": getDevice(),
200 'XX-Token': getToken() 200 'XX-Token': getToken()
@@ -961,7 +961,7 @@ @@ -961,7 +961,7 @@
961 tel: app.tel, 961 tel: app.tel,
962 attribute_id: app.attribute_id, 962 attribute_id: app.attribute_id,
963 num: app.num, 963 num: app.num,
964 - price: app.total, 964 + price: app.total
965 }; 965 };
966 var header = { 966 var header = {
967 "XX-Device-Type": getDevice(), 967 "XX-Device-Type": getDevice(),
@@ -970,7 +970,7 @@ @@ -970,7 +970,7 @@
970 getRequest('post', 'portal/Goods/applyOrder', post, header).then(function (res) { 970 getRequest('post', 'portal/Goods/applyOrder', post, header).then(function (res) {
971 if (res.data.code == 1) { 971 if (res.data.code == 1) {
972 app.order_id = res.data.data.oid; 972 app.order_id = res.data.data.oid;
973 - openView('my_pay', 'my/my_pay', '支付', 'my_pay', false, {order_id: app.order_id}); 973 + openView('my_pay', '../my/my_pay', '支付', 'my_pay', false, {order_id: app.order_id});
974 } else { 974 } else {
975 toastMsg(res.data.msg) 975 toastMsg(res.data.msg)
976 } 976 }
@@ -1076,7 +1076,6 @@ @@ -1076,7 +1076,6 @@
1076 var app = this; 1076 var app = this;
1077 app.active_index = index; 1077 app.active_index = index;
1078 app.active_name = app.attribute[index]; 1078 app.active_name = app.attribute[index];
1079 - app.attribute_id = app.attribute[index].id;  
1080 var post = { 1079 var post = {
1081 id: app.id, 1080 id: app.id,
1082 attribute: attr 1081 attribute: attr
@@ -1089,6 +1088,7 @@ @@ -1089,6 +1088,7 @@
1089 // alert(JSON.stringify(res)) 1088 // alert(JSON.stringify(res))
1090 if (res.data.code == 1) { 1089 if (res.data.code == 1) {
1091 app.priceList = res.data.data; 1090 app.priceList = res.data.data;
  1091 + app.attribute_id = res.data.data.attribute_id
1092 } else { 1092 } else {
1093 toastMsg(res.msg) 1093 toastMsg(res.msg)
1094 } 1094 }
@@ -1170,7 +1170,7 @@ @@ -1170,7 +1170,7 @@
1170 if (res.data.code == 1) { 1170 if (res.data.code == 1) {
1171 app.price_info = res.data.data; 1171 app.price_info = res.data.data;
1172 app.num = app.price_info.limit_num; 1172 app.num = app.price_info.limit_num;
1173 - app.attribute_id = app.price_info.attribute_id 1173 + app.attribute_id = res.data.data.attribute_id
1174 } 1174 }
1175 }) 1175 })
1176 } else { 1176 } else {
@@ -1181,16 +1181,6 @@ @@ -1181,16 +1181,6 @@
1181 pay_go: function () { 1181 pay_go: function () {
1182 var app = this; 1182 var app = this;
1183 if (app.active_left && app.active_right) { 1183 if (app.active_left && app.active_right) {
1184 - // api.sendEvent({  
1185 - // name: 'room',  
1186 - // extra: {  
1187 - // name_left: app.active_left,  
1188 - // name_right: app.active_right,  
1189 - // num: app.num,  
1190 - // price: app.price_info.price,  
1191 - // attribute_id: app.attribute_id  
1192 - // }  
1193 - // });  
1194 app.room = app.active_left + ',' + app.active_right + ',' + app.num + app.unit; 1184 app.room = app.active_left + ',' + app.active_right + ',' + app.num + app.unit;
1195 // // alert(JSON.stringify(ret.value)); 1185 // // alert(JSON.stringify(ret.value));
1196 // app.num = ret.value.num; 1186 // app.num = ret.value.num;
@@ -50,9 +50,8 @@ @@ -50,9 +50,8 @@
50 50
51 .examination_box { 51 .examination_box {
52 flex:1; 52 flex:1;
53 - margin: 0.1rem 0; 53 + /*margin: 0.1rem 0;*/
54 background-color: #fff; 54 background-color: #fff;
55 - box-shadow: 0.01rem 0.02rem 0.05rem #C8C6C6;  
56 display: flex; 55 display: flex;
57 display: -webkit-flex; 56 display: -webkit-flex;
58 display: -webkit-box; 57 display: -webkit-box;
@@ -96,17 +95,8 @@ @@ -96,17 +95,8 @@
96 <!-- 背景充满 --> 95 <!-- 背景充满 -->
97 <div id="loadStart"></div> 96 <div id="loadStart"></div>
98 <div id="app"> 97 <div id="app">
99 - <!--<header id="header">-->  
100 - <!--<div class="index_header white_bg">-->  
101 - <!--<div class="close_left" onclick="closeWindow()">-->  
102 - <!--<span class="iconfont icon-fanhui"></span>-->  
103 - <!--</div>-->  
104 - <!--<div class="win_mid">{{winTitle}}</div>-->  
105 - <!--<div></div>-->  
106 - <!--</div>-->  
107 - <!--</header>-->  
108 <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> 98 <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}">
109 - <div class="nurse_text">{{name}}</div> 99 + <!--<div class="nurse_text">{{name}}</div>-->
110 </div> 100 </div>
111 <div class="examination_swiper"> 101 <div class="examination_swiper">
112 <div class="swiper-container"> 102 <div class="swiper-container">
@@ -127,7 +127,6 @@ @@ -127,7 +127,6 @@
127 </div> 127 </div>
128 <div class="menus_item" @click="openHealth"><span class="iconfont icon-kongxin"></span><span>健康档案</span> 128 <div class="menus_item" @click="openHealth"><span class="iconfont icon-kongxin"></span><span>健康档案</span>
129 </div> 129 </div>
130 - <div class="menus_item" @click="openSever"><span class="iconfont icon-kefu"></span><span>客服服务</span></div>  
131 <div class="menus_item" @click="openStrict"><span class="iconfont icon-icon"></span><span>认购权益</span></div> 130 <div class="menus_item" @click="openStrict"><span class="iconfont icon-icon"></span><span>认购权益</span></div>
132 <!--<div class="menus_item" @click="openQrc"><span class="iconfont icon-saoyisao"></span><span>扫一扫</span></div>--> 131 <!--<div class="menus_item" @click="openQrc"><span class="iconfont icon-saoyisao"></span><span>扫一扫</span></div>-->
133 </div> 132 </div>
@@ -355,7 +354,7 @@ @@ -355,7 +354,7 @@
355 }, 354 },
356 // 切换当前城市 355 // 切换当前城市
357 goToCity: function () { 356 goToCity: function () {
358 - var app = this 357 + var app = this;
359 if (app.cityname == '') { 358 if (app.cityname == '') {
360 toastMsg('定位中') 359 toastMsg('定位中')
361 } else { 360 } else {
@@ -547,7 +546,7 @@ @@ -547,7 +546,7 @@
547 // }); 546 // });
548 break; 547 break;
549 case 9: 548 case 9:
550 - url = 'examination_f' 549 + url = 'Insurance'
551 // api.openWin({ 550 // api.openWin({
552 // name: 'Insurance_w', 551 // name: 'Insurance_w',
553 // url: './Insurance_w.html', 552 // url: './Insurance_w.html',
@@ -46,14 +46,9 @@ @@ -46,14 +46,9 @@
46 </style> 46 </style>
47 </head> 47 </head>
48 <body> 48 <body>
  49 +<div id="loadStart"></div>
49 <div id="app" v-cloak> 50 <div id="app" v-cloak>
50 - <header id="header">  
51 - <div class="index_header">  
52 - <div class="close_left" @click="closeWindow()"><span class="iconfont icon-fanhui"></span></div>  
53 - <div>{{name}}</div>  
54 - <div></div>  
55 - </div>  
56 - </header> 51 +
57 </div> 52 </div>
58 </body> 53 </body>
59 </html> 54 </html>
@@ -72,24 +67,17 @@ @@ -72,24 +67,17 @@
72 data: { 67 data: {
73 headerH: '', 68 headerH: '',
74 name: '', 69 name: '',
75 - url: '', 70 + url: ''
76 }, 71 },
77 created: function () { 72 created: function () {
78 73
79 - apiready = function () {  
80 - app.name = api.pageParam.name;  
81 - app.url = api.pageParam.url;  
82 - // alert(app.url);  
83 - $api.fixStatusBar($api.dom('header'));  
84 - api.setStatusBarStyle({  
85 - style: 'dark'  
86 - });  
87 - app.headerH = $api.offset($api.dom('header')).h;  
88 - app.openInsurance()  
89 - } 74 + this.name = localStorage.getItem('name');
  75 + this.url = localStorage.getItem('url');
  76 + this.openInsurance()
90 }, 77 },
91 methods: { 78 methods: {
92 openInsurance: function () { 79 openInsurance: function () {
  80 + var app = this;
93 if (app.url == '' || app.url == null || app.url == undefined) { 81 if (app.url == '' || app.url == null || app.url == undefined) {
94 api.alert({ 82 api.alert({
95 title: '暂无相关商品', 83 title: '暂无相关商品',
@@ -101,17 +89,9 @@ @@ -101,17 +89,9 @@
101 }); 89 });
102 } 90 }
103 else { 91 else {
104 - api.openFrame({  
105 - name: 'Insurance',  
106 - url: app.url,  
107 - rect: {  
108 - x: 0,  
109 - y: app.headerH,  
110 - w: api.frameWidth,  
111 - h: api.frameHeight - app.headerH  
112 - },  
113 - }); 92 + window.location.href = app.url
114 } 93 }
  94 + loadEnd();
115 } 95 }
116 } 96 }
117 }) 97 })
@@ -18,13 +18,13 @@ @@ -18,13 +18,13 @@
18 <div id="loadStart"></div> 18 <div id="loadStart"></div>
19 19
20 <div id="app" v-cloak> 20 <div id="app" v-cloak>
21 - <header id="header">  
22 - <div class="index_header white_bg" >  
23 - <div class="close_left" onclick="closeWindow()"><span class="iconfont icon-fanhui"></span></div>  
24 - <div class="win_mid">{{winTitle}}</div>  
25 - <div></div>  
26 - </div>  
27 - </header> 21 + <!--<header id="header">-->
  22 + <!--<div class="index_header white_bg" >-->
  23 + <!--<div class="close_left" onclick="closeWindow()"><span class="iconfont icon-fanhui"></span></div>-->
  24 + <!--<div class="win_mid">{{winTitle}}</div>-->
  25 + <!--<div></div>-->
  26 + <!--</div>-->
  27 + <!--</header>-->
28 <div class="warp"> 28 <div class="warp">
29 <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> 29 <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}">
30 <!--<div class="nurse_text">{{name}}</div>--> 30 <!--<div class="nurse_text">{{name}}</div>-->
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@
89 this.cid = localStorage.getItem('cid'); 89 this.cid = localStorage.getItem('cid');
90 this.cityname = localStorage.getItem('cityName'); 90 this.cityname = localStorage.getItem('cityName');
91 this.winTitle = localStorage.getItem('winTitle') 91 this.winTitle = localStorage.getItem('winTitle')
  92 + document.title = localStorage.getItem('winTitle')
92 this.getCatInfo(); 93 this.getCatInfo();
93 }, 94 },
94 methods: { 95 methods: {
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <style> 17 <style>
18 body { 18 body {
19 background-color: #f2f2f2; 19 background-color: #f2f2f2;
20 - padding-bottom: 1.5rem; 20 + padding-bottom: 1.12rem;
21 } 21 }
22 22
23 .imgList { 23 .imgList {
@@ -734,6 +734,11 @@ @@ -734,6 +734,11 @@
734 border-radius: 0.1rem; 734 border-radius: 0.1rem;
735 font-size: 15px; 735 font-size: 15px;
736 } 736 }
  737 + /*套餐选择*/
  738 + .img_box {
  739 + margin: 0.21rem 0.24rem 0.8rem 0.24rem;
  740 + overflow: hidden;
  741 + }
737 </style> 742 </style>
738 <body> 743 <body>
739 <div id="loadStart"></div> 744 <div id="loadStart"></div>
@@ -1052,6 +1057,12 @@ @@ -1052,6 +1057,12 @@
1052 <div class="save_btn" @click="auth_next">提交</div> 1057 <div class="save_btn" @click="auth_next">提交</div>
1053 <div class="auth2_tips">为提高审核速度，请最少上传1张清晰的图片</div> 1058 <div class="auth2_tips">为提高审核速度，请最少上传1张清晰的图片</div>
1054 </div> 1059 </div>
  1060 + <!--上门类工具提示-->
  1061 + <div @click="close" class="meal" v-if="tool">
  1062 + <div class="img_box" @click.stop><img src="../../assets/image/price_img.png" alt="" width="100%"></div>
  1063 + <!--<div v-html="tool_img"></div>-->
  1064 + <div class="save_btn" @click="close">确定</div>
  1065 + </div>
1055 </div> 1066 </div>
1056 </body> 1067 </body>
1057 </html> 1068 </html>
@@ -1161,7 +1172,10 @@ @@ -1161,7 +1172,10 @@
1161 popupVisible1: false, 1172 popupVisible1: false,
1162 popupVisible2: false, 1173 popupVisible2: false,
1163 popupVisible3: false, 1174 popupVisible3: false,
1164 - configinfo: [] 1175 + configinfo: [],
  1176 + // 上门工具
  1177 + tool: false ,
  1178 + second: false
1165 }, 1179 },
1166 created: function () { 1180 created: function () {
1167 var app = this; 1181 var app = this;
@@ -1382,7 +1396,10 @@ @@ -1382,7 +1396,10 @@
1382 openIsPro: function () { 1396 openIsPro: function () {
1383 var app = this; 1397 var app = this;
1384 app.isPro = !app.isPro; 1398 app.isPro = !app.isPro;
1385 - window.location.href = '../common/tool_fm.html'; 1399 + if(!app.second){
  1400 + this.tool = true;
  1401 + app.second = true
  1402 + }
1386 }, 1403 },
1387 // 去协议 1404 // 去协议
1388 getAgreement: function (name, id) { 1405 getAgreement: function (name, id) {
@@ -1662,6 +1679,7 @@ @@ -1662,6 +1679,7 @@
1662 // }); 1679 // });
1663 this.taocan = false; 1680 this.taocan = false;
1664 this.room = false; 1681 this.room = false;
  1682 + this.tool = false;
1665 }, 1683 },
1666 t_choose_sever: function (attr, index) { 1684 t_choose_sever: function (attr, index) {
1667 var app = this; 1685 var app = this;
@@ -1800,6 +1818,8 @@ @@ -1800,6 +1818,8 @@
1800 api.closeWin(); 1818 api.closeWin();
1801 } 1819 }
1802 }, 1820 },
  1821 + //工具否
  1822 +
1803 1823
1804 // 去预约 1824 // 去预约
1805 appointment: function () { 1825 appointment: function () {
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 <link rel="stylesheet" href="../../assets/css/doc.css"> 13 <link rel="stylesheet" href="../../assets/css/doc.css">
14 <link rel="stylesheet" href="../../assets/css/pay_form_f.css"> 14 <link rel="stylesheet" href="../../assets/css/pay_form_f.css">
15 <link rel="stylesheet" href="../../assets/icon/iconfont.css"> 15 <link rel="stylesheet" href="../../assets/icon/iconfont.css">
  16 + <title>健康旅游</title>
16 <style> 17 <style>
17 body { 18 body {
18 background-color: #f5f5f5; 19 background-color: #f5f5f5;
@@ -307,22 +308,12 @@ @@ -307,22 +308,12 @@
307 .tral_fee_box{ 308 .tral_fee_box{
308 background-color: #fff; 309 background-color: #fff;
309 } 310 }
310 - .swiper-container{  
311 - margin-top: 44px;  
312 - }  
313 </style> 311 </style>
314 </head> 312 </head>
315 <body> 313 <body>
316 <div id="loadStart"></div> 314 <div id="loadStart"></div>
317 <div id="app" v-cloak> 315 <div id="app" v-cloak>
318 <div class="health_swiper"> 316 <div class="health_swiper">
319 - <header id="header" class="border0 index_header">  
320 - <div :class="['index_header',color_change?'index_on':'','border0']">  
321 - <span class="iconfont icon-fanhui" onclick="closeWindow()"></span>  
322 - <span>健康旅游</span>  
323 - <span class="iconfont icon-fenxiang-tianchong" @click="share"></span>  
324 - </div>  
325 - </header>  
326 <div class="swiper-container"> 317 <div class="swiper-container">
327 <div class="swiper-wrapper"> 318 <div class="swiper-wrapper">
328 <div class="swiper-slide" v-for="(item,index) in banner" 319 <div class="swiper-slide" v-for="(item,index) in banner"
@@ -415,10 +406,6 @@ @@ -415,10 +406,6 @@
415 <div class="health_tral border0" @click="body_show=!body_show"> 406 <div class="health_tral border0" @click="body_show=!body_show">
416 <div class="health_tral_top"><span>费用不包含</span></div> 407 <div class="health_tral_top"><span>费用不包含</span></div>
417 </div> 408 </div>
418 - <!---->  
419 - <!--<ul class="tral_fee_item">-->  
420 - <!--<li></li>-->  
421 - <!--</ul>-->  
422 <div v-html="noinclude"> 409 <div v-html="noinclude">
423 410
424 </div> 411 </div>
@@ -469,13 +456,13 @@ @@ -469,13 +456,13 @@
469 app.health_swiper = new Swiper('.swiper-container', { 456 app.health_swiper = new Swiper('.swiper-container', {
470 effect: 'fade', 457 effect: 'fade',
471 fade: { 458 fade: {
472 - crossFade: true, 459 + crossFade: true
473 }, 460 },
474 autoplay: 3000, 461 autoplay: 3000,
475 pagination: '.swiper-pagination', 462 pagination: '.swiper-pagination',
476 paginationClickable: true, 463 paginationClickable: true,
477 observer: true, 464 observer: true,
478 - observeParents: true, 465 + observeParents: true
479 }); 466 });
480 app.travel() 467 app.travel()
481 }, 468 },
@@ -491,13 +478,12 @@ @@ -491,13 +478,12 @@
491 }) 478 })
492 }, 479 },
493 travel: function () { 480 travel: function () {
494 - var app = this 481 + var app = this;
495 var header = { 482 var header = {
496 "XX-Device-Type": getDevice(), 483 "XX-Device-Type": getDevice(),
497 'XX-Token': getToken() 484 'XX-Token': getToken()
498 }; 485 };
499 getRequest('post', 'portal/Goods/travel', null, header).then(function (res) { 486 getRequest('post', 'portal/Goods/travel', null, header).then(function (res) {
500 - // alert(JSON.stringify(res));  
501 if (res.data.code == 1) { 487 if (res.data.code == 1) {
502 app.banner = res.data.data.banner; 488 app.banner = res.data.data.banner;
503 app.day_num = res.data.data.day_num; 489 app.day_num = res.data.data.day_num;
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 }; 86 };
87 var header = { 87 var header = {
88 'XX-Device-Type': getDevice() 88 'XX-Device-Type': getDevice()
89 - } 89 + };
90 getRequest('POST', 'home/index/loginBySMS', post, header).then(function (res) { 90 getRequest('POST', 'home/index/loginBySMS', post, header).then(function (res) {
91 console.log(res); 91 console.log(res);
92 if(res.data.code ===1){ 92 if(res.data.code ===1){
@@ -136,7 +136,6 @@ @@ -136,7 +136,6 @@
136 'XX-Device-Type': getDevice() 136 'XX-Device-Type': getDevice()
137 }; 137 };
138 getRequest('post', 'home/index/checkSMS', post, header).then(function (res) { 138 getRequest('post', 'home/index/checkSMS', post, header).then(function (res) {
139 - alert(JSON.stringify(res))  
140 if (res.data.code == 1) { 139 if (res.data.code == 1) {
141 localStorage.setItem('token', res.data.data.token); 140 localStorage.setItem('token', res.data.data.token);
142 window.location.href = '../index/index_f.html' 141 window.location.href = '../index/index_f.html'
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 // app.type_id = api.pageParam.id; 128 // app.type_id = api.pageParam.id;
129 // app.rid = api.pageParam.rid; 129 // app.rid = api.pageParam.rid;
130 this.type_id=localStorage.getItem("id"); 130 this.type_id=localStorage.getItem("id");
131 - this.rid=localStorage.getItem("rid") 131 + this.rid=localStorage.getItem("rid");
132 this.typeInfo(); 132 this.typeInfo();
133 // } 133 // }
134 }, 134 },
@@ -232,15 +232,7 @@ @@ -232,15 +232,7 @@
232 // 保存选择结果 232 // 保存选择结果
233 save_info: function () { 233 save_info: function () {
234 var app=this; 234 var app=this;
235 -  
236 - toastMsg('正在保存')  
237 - // api.showProgress({  
238 - // title: '保存中',  
239 - // text: '正在保存……',  
240 - // modal: false  
241 - // });  
242 -  
243 - 235 + // toastMsg('正在保存')
244 var header = { 236 var header = {
245 "XX-Device-Type": getDevice(), 237 "XX-Device-Type": getDevice(),
246 'XX-Token': getToken() 238 'XX-Token': getToken()
@@ -267,14 +259,10 @@ @@ -267,14 +259,10 @@
267 getRequest('post', 'user/index/Answer', post, header).then(function (res) { 259 getRequest('post', 'user/index/Answer', post, header).then(function (res) {
268 // alert(JSON.stringify(res)); 260 // alert(JSON.stringify(res));
269 if (res.data.code == 1) { 261 if (res.data.code == 1) {
270 - api.sendEvent({  
271 - name: 'history',  
272 - });  
273 - setTimeout(function() {  
274 - api.hideProgress();  
275 - toastMsg('保存成功');  
276 - api.closeWin();  
277 - }, 2000) 262 + toastMsg('保存成功');
  263 + setTimeout(function(){
  264 + window.history.back()
  265 + },1500)
278 } 266 }
279 }) 267 })
280 } 268 }
@@ -290,30 +290,30 @@ @@ -290,30 +290,30 @@
290 created: function () { 290 created: function () {
291 var app = this; 291 var app = this;
292 for (var i = 0; i < 300; i++) { 292 for (var i = 0; i < 300; i++) {
293 - app.weight_list.push({ 293 + this.weight_list.push({
294 "label": i + 'kg', 294 "label": i + 'kg',
295 "value": i, 295 "value": i,
296 }) 296 })
297 } 297 }
298 for (var j = 50; j < 300; j++) { 298 for (var j = 50; j < 300; j++) {
299 - app.height_list.push( 299 + this.height_list.push(
300 { 300 {
301 "label": j + 'cm', 301 "label": j + 'cm',
302 "value": j, 302 "value": j,
303 } 303 }
304 ) 304 )
305 } 305 }
306 - app.user_type_name = localStorage.getItem('name');  
307 - app.rid = localStorage.getItem('rid'); 306 + this.user_type_name = localStorage.getItem('name');
  307 + this.rid = localStorage.getItem('rid');
308 // alert(app.rid) 308 // alert(app.rid)
309 - app.type = localStorage.getItem('type');  
310 - if (app.type == 0) {  
311 - app.getUserinfo(); 309 + this.type = localStorage.getItem('type');
  310 + if (this.type == 0) {
  311 + this.getUserinfo();
312 } 312 }
313 - app.getJob();  
314 - app.getCulture();  
315 - app.getMedical();  
316 - app.getRelationship(); 313 + this.getJob();
  314 + this.getCulture();
  315 + this.getMedical();
  316 + this.getRelationship();
317 }, 317 },
318 methods: { 318 methods: {
319 // 获取个人信息 319 // 获取个人信息
@@ -717,6 +717,7 @@ @@ -717,6 +717,7 @@
717 }, 717 },
718 // 设置信息 718 // 设置信息
719 setPersonal: function () { 719 setPersonal: function () {
  720 + var app = this;
720 var post = { 721 var post = {
721 rid: app.rid, 722 rid: app.rid,
722 avatar: app.head_img, 723 avatar: app.head_img,
@@ -765,9 +766,7 @@ @@ -765,9 +766,7 @@
765 // alert(JSON.stringify(res)); 766 // alert(JSON.stringify(res));
766 if (res.data.code == 1) { 767 if (res.data.code == 1) {
767 app.user_info = res.data.data; 768 app.user_info = res.data.data;
768 - api.sendEvent({  
769 - name: 'changeInfo',  
770 - }); 769 +
771 toastMsg(res.data.msg); 770 toastMsg(res.data.msg);
772 setTimeout(function () { 771 setTimeout(function () {
773 api.closeWin(); 772 api.closeWin();
@@ -337,7 +337,7 @@ @@ -337,7 +337,7 @@
337 if(app.user_type == '') { 337 if(app.user_type == '') {
338 toastMsg('未登录') 338 toastMsg('未登录')
339 } else { 339 } else {
340 - openView('my_detail', 'my/my_detail', '个人资料', 'my_detail', false, { 340 + openView('my_detail', '../my/my_detail', '个人资料', 'my_detail', false, {
341 rid: 0, 341 rid: 0,
342 type: 0 342 type: 0
343 }) 343 })
@@ -345,7 +345,7 @@ @@ -345,7 +345,7 @@
345 }, 345 },
346 // 设置 346 // 设置
347 set: function() { 347 set: function() {
348 - window.location.href = 'my_set.html' 348 + window.location.href = '../my/my_set.html'
349 // openView('my_set', 'my/my_set', '设置', 'my_set', false, false, false) 349 // openView('my_set', 'my/my_set', '设置', 'my_set', false, false, false)
350 }, 350 },
351 // 常见问题 351 // 常见问题
@@ -354,7 +354,7 @@ @@ -354,7 +354,7 @@
354 if(app.user_type == '') { 354 if(app.user_type == '') {
355 toastMsg('未登录') 355 toastMsg('未登录')
356 } else { 356 } else {
357 - window.location.href = 'my_que.html' 357 + window.location.href = '../my/my_que.html'
358 // openView('my_que', 'my/my_que', '常见问题', 'my_que', false, false, false) 358 // openView('my_que', 'my/my_que', '常见问题', 'my_que', false, false, false)
359 } 359 }
360 }, 360 },
@@ -377,7 +377,7 @@ @@ -377,7 +377,7 @@
377 if(app.user_type == '') { 377 if(app.user_type == '') {
378 toastMsg('未登录') 378 toastMsg('未登录')
379 } else { 379 } else {
380 - window.location.href = 'my_orderlist.html'; 380 + window.location.href = '../my/my_orderlist.html';
381 // openView('my_orderlist', 'my/my_orderlist', '我的订单', 'my_orderlist', false, false, false); 381 // openView('my_orderlist', 'my/my_orderlist', '我的订单', 'my_orderlist', false, false, false);
382 } 382 }
383 }, 383 },
@@ -387,7 +387,7 @@ @@ -387,7 +387,7 @@
387 if(app.user_type == '') { 387 if(app.user_type == '') {
388 toastMsg('未登录') 388 toastMsg('未登录')
389 } else { 389 } else {
390 - openView('my_news', 'my/my_news', '消息通知', 'my_news', false, { 390 + openView('my_news', '../my/my_news', '消息通知', 'my_news', false, {
391 new_type: 0 391 new_type: 0
392 }) 392 })
393 } 393 }
@@ -438,7 +438,7 @@ @@ -438,7 +438,7 @@
438 } else { 438 } else {
439 getRequest('post', 'user/index/myRights', null, header).then(function(res) { 439 getRequest('post', 'user/index/myRights', null, header).then(function(res) {
440 if(res.data.code == 1) { 440 if(res.data.code == 1) {
441 - window.location.href = 'my_benefit.html' 441 + window.location.href = '../my/my_benefit.html'
442 // openView('my_benefit', 'my/my_benefit', '我的权益', 'my_benefit', false, false, false) 442 // openView('my_benefit', 'my/my_benefit', '我的权益', 'my_benefit', false, false, false)
443 } else { 443 } else {
444 toastMsg(res.data.msg); 444 toastMsg(res.data.msg);
@@ -454,7 +454,7 @@ @@ -454,7 +454,7 @@
454 } else { 454 } else {
455 localStorage.setItem('rid','0'); 455 localStorage.setItem('rid','0');
456 localStorage.setItem('Htype','0'); 456 localStorage.setItem('Htype','0');
457 - window.location.href = 'my_health.html'; 457 + window.location.href = '../my/my_health.html';
458 // api.openFrame({ 458 // api.openFrame({
459 // name: 'my_health', 459 // name: 'my_health',
460 // url: './my_health.html', 460 // url: './my_health.html',
@@ -489,7 +489,7 @@ @@ -489,7 +489,7 @@
489 }); 489 });
490 }, //底部菜单跳转 490 }, //底部菜单跳转
491 changeTab(index){ 491 changeTab(index){
492 - var url = index==0?'../index/index_f.html':index == 1?'../strict/strict_f.html':'my_f.html' 492 + var url = index==0?'../index/index_f.html':index == 1?'../strict/strict_f.html':'../my/my_f.html'
493 window.location.href = url 493 window.location.href = url
494 } 494 }
495 495
@@ -150,27 +150,8 @@ @@ -150,27 +150,8 @@
150 familyRecord_data: [] 150 familyRecord_data: []
151 }, 151 },
152 created: function () { 152 created: function () {
153 - apiready = function () {  
154 - app.familyRecord();  
155 - var mySwiper = new Swiper('.swiper-container', {  
156 - speed: 1000,  
157 - observer: true,  
158 - observeParents: true,  
159 - effect: 'coverflow',  
160 - slidesPerView: 1,  
161 - coverflow: {  
162 - rotate: 0,  
163 - depth: 60,  
164 - modifier: 2,  
165 - stretch: 20,  
166 - slideShadows: false  
167 - },  
168 - pagination: {  
169 - el: '.swiper-pagination',  
170 - clickable: true  
171 - },  
172 - });  
173 - } 153 + this.familyRecord();
  154 +
174 }, 155 },
175 methods: { 156 methods: {
176 // 获取亲友信息档案 157 // 获取亲友信息档案
@@ -191,22 +172,35 @@ @@ -191,22 +172,35 @@
191 }, 172 },
192 // 跳转详情页面 173 // 跳转详情页面
193 openFri: function (rid) { 174 openFri: function (rid) {
194 - api.openFrame({ 175 + openWin({
195 name: 'my_health', 176 name: 'my_health',
196 url: './my_health.html', 177 url: './my_health.html',
197 - // bounces: true,  
198 - rect: {  
199 - x: 0,  
200 - y: 0,  
201 - w: 'auto',  
202 - h: 'auto',  
203 - },  
204 pageParam: { 178 pageParam: {
205 rid: rid, 179 rid: rid,
206 type:0 180 type:0
207 } 181 }
208 }); 182 });
209 - }, 183 + }
  184 + },
  185 + mounted(){
  186 + var mySwiper = new Swiper('.swiper-container', {
  187 + speed: 1000,
  188 + observer: true,
  189 + observeParents: true,
  190 + effect: 'coverflow',
  191 + slidesPerView: 1,
  192 + coverflow: {
  193 + rotate: 0,
  194 + depth: 60,
  195 + modifier: 2,
  196 + stretch: 20,
  197 + slideShadows: false
  198 + },
  199 + pagination: {
  200 + el: '.swiper-pagination',
  201 + clickable: true
  202 + }
  203 + });
210 } 204 }
211 }) 205 })
212 </script> 206 </script>
@@ -323,6 +323,17 @@ @@ -323,6 +323,17 @@
323 <body> 323 <body>
324 <div id="loadStart"></div> 324 <div id="loadStart"></div>
325 <div id="app"> 325 <div id="app">
  326 + <header id="header">
  327 + <div class="health_top">
  328 + <div @click="closeWindow()" class="close_left"><span class="iconfont icon-fanhui"></span></div>
  329 + <div class="health_mid" v-if="rid==0">健康档案</div>
  330 + <div class="health_mid" v-else>亲友档案</div>
  331 + <div class="index_right" @click="show_list" v-if="rid==0">
  332 + <img src="../../assets/image/plus.png" alt="" :class="{img_transform:img_active}">
  333 + </div>
  334 + <div class="index_right" v-else></div>
  335 + </div>
  336 + </header>
326 <div class="health_head"> 337 <div class="health_head">
327 <!--<div class="health_top" :style="{top: top}">--> 338 <!--<div class="health_top" :style="{top: top}">-->
328 <!--<div @click="closeWindow()" class="close_left"><span class="iconfont icon-fanhui"></span></div>--> 339 <!--<div @click="closeWindow()" class="close_left"><span class="iconfont icon-fanhui"></span></div>-->
@@ -367,6 +378,7 @@ @@ -367,6 +378,7 @@
367 <div><span v-if="record_data.history==1">已完善</span><span v-else>未完善</span><span 378 <div><span v-if="record_data.history==1">已完善</span><span v-else>未完善</span><span
368 class="iconfont icon-xiangyou"></span></div> 379 class="iconfont icon-xiangyou"></span></div>
369 </div> 380 </div>
  381 +
370 <div class="header_info_item" @click="openData"> 382 <div class="header_info_item" @click="openData">
371 <div class="header_info_img"><img src="../../assets/image/h3.png" alt=""><span>健康数据</span></div> 383 <div class="header_info_img"><img src="../../assets/image/h3.png" alt=""><span>健康数据</span></div>
372 <div><span v-if="record_data.h_data==1">已完善</span><span v-else>未完善</span><span 384 <div><span v-if="record_data.h_data==1">已完善</span><span v-else>未完善</span><span
@@ -451,12 +463,10 @@ @@ -451,12 +463,10 @@
451 // }); 463 // });
452 }, 464 },
453 methods: { 465 methods: {
454 - // close: function () {  
455 - // alert(1)  
456 - // api.closeWin({  
457 - // name: 'my_health'  
458 - // });  
459 - // }, 466 + show_list: function () {
  467 + var app = this;
  468 + app.img_active = !app.img_active;
  469 + },
460 // 个人资料 470 // 个人资料
461 openPerson: function () { 471 openPerson: function () {
462 var app = this; 472 var app = this;
@@ -476,13 +486,7 @@ @@ -476,13 +486,7 @@
476 addPerson: function () { 486 addPerson: function () {
477 var app = this; 487 var app = this;
478 app.img_active = false; 488 app.img_active = false;
479 - api.sendEvent({  
480 - name: 'hidelist',  
481 - extra: {  
482 - img_active:app.img_active  
483 - }  
484 - });  
485 - openView('my_detail', 'my/my_detail', '添加亲友档案', 'my_detail', false, {type: 1, rid: app.rid}) 489 + openView('my_detail', '../my/my_detail', '添加亲友档案', 'my_detail', false, {type: 1, rid: app.rid})
486 }, 490 },
487 // 健康数据 491 // 健康数据
488 openData: function () { 492 openData: function () {
@@ -506,7 +510,7 @@ @@ -506,7 +510,7 @@
506 openFriend: function () { 510 openFriend: function () {
507 var app = this; 511 var app = this;
508 app.img_active = false; 512 app.img_active = false;
509 - openView('my_fri', 'my/my_fri', '亲友健康档案', 'my_fri', false, false, false); 513 + openView('my_fri', '../my/my_fri', '亲友健康档案', 'my_fri', false, false, false);
510 }, 514 },
511 // 获取个人档案完善情况 515 // 获取个人档案完善情况
512 record: function () { 516 record: function () {
@@ -8,10 +8,14 @@ @@ -8,10 +8,14 @@
8 <meta http-equiv="X-UA-Compatible" content="ie=edge"> 8 <meta http-equiv="X-UA-Compatible" content="ie=edge">
9 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no"> 9 <meta name="format-detection" content="telephone=no,email=no,date=no,address=no">
10 <script src="../../assets/js/fontsize.js"></script> 10 <script src="../../assets/js/fontsize.js"></script>
  11 +
11 <link rel="stylesheet" href="../../assets/css/api.css"/> 12 <link rel="stylesheet" href="../../assets/css/api.css"/>
12 <link rel="stylesheet" href="../../assets/css/style.css"> 13 <link rel="stylesheet" href="../../assets/css/style.css">
13 <link rel="stylesheet" href="../../assets/css/pay.css"> 14 <link rel="stylesheet" href="../../assets/css/pay.css">
14 <link rel="stylesheet" href="../../assets/icon/iconfont.css"> 15 <link rel="stylesheet" href="../../assets/icon/iconfont.css">
  16 + <link rel="stylesheet" href="../../assets/css/weui.min.css">
  17 +
  18 +
15 <title></title> 19 <title></title>
16 <style> 20 <style>
17 body, html { 21 body, html {
@@ -138,6 +142,11 @@ @@ -138,6 +142,11 @@
138 .price_fee { 142 .price_fee {
139 color: #424242; 143 color: #424242;
140 } 144 }
  145 + .weui-toast{
  146 + height: 36px;
  147 + min-height: 30px;
  148 + top: 50%;
  149 + }
141 </style> 150 </style>
142 </head> 151 </head>
143 <body> 152 <body>
@@ -230,24 +239,10 @@ @@ -230,24 +239,10 @@
230 pay_price: 0,//最终支付价格 239 pay_price: 0,//最终支付价格
231 }, 240 },
232 created: function () { 241 created: function () {
233 - apiready = function () {  
234 - app.order_id = api.pageParam.order_id;  
235 - app.add();  
236 - app.getOrderPay();  
237 - app.getConsumeMoney();  
238 - api.addEventListener({  
239 - name: 'price_event'  
240 - }, function (ret, err) {  
241 - app.fee_price = parseFloat(ret.value.price);  
242 - app.discount_id = ret.value.id;  
243 - app.fee_pay = ret.value.fee_pay;  
244 - if (ret.value.fee_pay) {  
245 - app.getRealPay(1)  
246 - } else {  
247 - app.getRealPay(0)  
248 - }  
249 - });  
250 - } 242 + this.order_id = localStorage.getItem('order_id');
  243 + this.add();
  244 + this.getOrderPay();
  245 + this.getConsumeMoney();
251 }, 246 },
252 watch: { 247 watch: {
253 second: { 248 second: {
@@ -272,6 +267,7 @@ @@ -272,6 +267,7 @@
272 methods: { 267 methods: {
273 // 获取订单详情 268 // 获取订单详情
274 getOrderPay: function () { 269 getOrderPay: function () {
  270 + var app = this;
275 var header = { 271 var header = {
276 "XX-Device-Type": getDevice(), 272 "XX-Device-Type": getDevice(),
277 'XX-Token': getToken() 273 'XX-Token': getToken()
@@ -303,6 +299,7 @@ @@ -303,6 +299,7 @@
303 }, 299 },
304 // 支付倒计时 300 // 支付倒计时
305 add: function () { 301 add: function () {
  302 + var app = this;
306 var time = window.setInterval(function () { 303 var time = window.setInterval(function () {
307 if (app.seconds == 0 && app.minutes != 0) { 304 if (app.seconds == 0 && app.minutes != 0) {
308 app.seconds = 59; 305 app.seconds = 59;
@@ -320,6 +317,7 @@ @@ -320,6 +317,7 @@
320 }, 317 },
321 // 获取消费金张数 318 // 获取消费金张数
322 getConsumeMoney: function () { 319 getConsumeMoney: function () {
  320 + var app = this;
323 var post = { 321 var post = {
324 order_id: app.order_id 322 order_id: app.order_id
325 }; 323 };
@@ -338,6 +336,7 @@ @@ -338,6 +336,7 @@
338 }, 336 },
339 // 消费金支付 337 // 消费金支付
340 fee_choose: function () { 338 fee_choose: function () {
  339 + var app = this;
341 // toastMsg('暂无消费金') 340 // toastMsg('暂无消费金')
342 if (app.balance_type == true) { 341 if (app.balance_type == true) {
343 app.wx_type = false; 342 app.wx_type = false;
@@ -351,6 +350,7 @@ @@ -351,6 +350,7 @@
351 }, 350 },
352 // 微信支付 351 // 微信支付
353 choose_wx: function () { 352 choose_wx: function () {
  353 + var app = this;
354 app.fee_pay = false; 354 app.fee_pay = false;
355 app.zhifu_type = false; 355 app.zhifu_type = false;
356 if (app.wx_type == true) { 356 if (app.wx_type == true) {
@@ -361,6 +361,7 @@ @@ -361,6 +361,7 @@
361 }, 361 },
362 // 支付宝支付 362 // 支付宝支付
363 choose_zhi_fu: function () { 363 choose_zhi_fu: function () {
  364 + var app = this;
364 app.fee_pay = false; 365 app.fee_pay = false;
365 app.wx_type = false; 366 app.wx_type = false;
366 // app.zhifu_type = true; 367 // app.zhifu_type = true;
@@ -373,6 +374,7 @@ @@ -373,6 +374,7 @@
373 }, 374 },
374 // 余额支付 375 // 余额支付
375 choose_yue: function () { 376 choose_yue: function () {
  377 + var app = this;
376 app.balance_type = !app.balance_type; 378 app.balance_type = !app.balance_type;
377 if (app.balance_type == true && app.fee_pay == true) { 379 if (app.balance_type == true && app.fee_pay == true) {
378 app.wx_type = false; 380 app.wx_type = false;
@@ -393,6 +395,7 @@ @@ -393,6 +395,7 @@
393 }, 395 },
394 // 支付 396 // 支付
395 pay_order: function () { 397 pay_order: function () {
  398 + var app = this;
396 if (app.wx_type == false && app.balance_type == false && app.zhifu_type == false && app.fee_pay == false) { 399 if (app.wx_type == false && app.balance_type == false && app.zhifu_type == false && app.fee_pay == false) {
397 toastMsg('请选择支付方式') 400 toastMsg('请选择支付方式')
398 } 401 }
@@ -449,6 +452,7 @@ @@ -449,6 +452,7 @@
449 452
450 // 获取价格 453 // 获取价格
451 getRealPay: function (pay_type) { 454 getRealPay: function (pay_type) {
  455 + var app = this;
452 var post = { 456 var post = {
453 order_id: app.order_id, 457 order_id: app.order_id,
454 pay_type: pay_type, 458 pay_type: pay_type,
@@ -468,6 +472,7 @@ @@ -468,6 +472,7 @@
468 }, 472 },
469 // 取消支付 473 // 取消支付
470 cancel_order: function () { 474 cancel_order: function () {
  475 + var app = this;
471 api.showProgress({ 476 api.showProgress({
472 title: '取消订单', 477 title: '取消订单',
473 text: '正在处理...', 478 text: '正在处理...',
@@ -492,6 +497,7 @@ @@ -492,6 +497,7 @@
492 }, 497 },
493 // 消费金单独支付 498 // 消费金单独支付
494 fee_pay_fun: function () { 499 fee_pay_fun: function () {
  500 + var app = this;
495 var header = { 501 var header = {
496 "XX-Device-Type": getDevice(), 502 "XX-Device-Type": getDevice(),
497 'XX-Token': getToken() 503 'XX-Token': getToken()
@@ -527,6 +533,7 @@ @@ -527,6 +533,7 @@
527 }, 533 },
528 // 余额单独支付 534 // 余额单独支付
529 packetPay: function (type) { 535 packetPay: function (type) {
  536 + var app = this;
530 var header = { 537 var header = {
531 "XX-Device-Type": getDevice(), 538 "XX-Device-Type": getDevice(),
532 'XX-Token': getToken() 539 'XX-Token': getToken()
@@ -550,6 +557,7 @@ @@ -550,6 +557,7 @@
550 }, 557 },
551 // 微信支付 558 // 微信支付
552 WeChatPay: function (type) { 559 WeChatPay: function (type) {
  560 + var app = this;
553 var wx = api.require('wxPay'); 561 var wx = api.require('wxPay');
554 var header = { 562 var header = {
555 "XX-Device-Type": getDevice(), 563 "XX-Device-Type": getDevice(),
@@ -601,6 +609,7 @@ @@ -601,6 +609,7 @@
601 }, 609 },
602 //支付宝支付 610 //支付宝支付
603 aliPay: function (type) { 611 aliPay: function (type) {
  612 + var app = this;
604 var aliPay = api.require('aliPay'); 613 var aliPay = api.require('aliPay');
605 var post = { 614 var post = {
606 order_id: app.order_id, 615 order_id: app.order_id,
@@ -68,10 +68,10 @@ @@ -68,10 +68,10 @@
68 </head> 68 </head>
69 <body> 69 <body>
70 <div id="app"> 70 <div id="app">
71 - <div :class="['que_body',ind==index?'':'que_show']" v-for="(item,index) in getQA_data"> 71 + <div :class="['que_body',item.ind==index?'':'que_show']" v-for="(item,index) in getQA_data">
72 <div class="que_box" @click="transform_fn(index)"> 72 <div class="que_box" @click="transform_fn(index)">
73 - <div><span class="iconfont icon-wenhao1"></span><span>{{item.question}}</span></div>  
74 - <div :class="['iconfont','icon-xiangyou',ind==index?'tans':'tanss']"></div> 73 + <div class="describle"><span class="iconfont icon-wenhao1"></span><span>{{item.question}}</span></div>
  74 + <div :class="['iconfont','icon-xiangyou',item.ind==index?'tans':'tanss']"></div>
75 </div> 75 </div>
76 <div class="que_content"> 76 <div class="que_content">
77 <span class="iconfont icon-xiaoxiwei"></span> 77 <span class="iconfont icon-xiaoxiwei"></span>
@@ -98,32 +98,37 @@ @@ -98,32 +98,37 @@
98 ind: -1 98 ind: -1
99 }, 99 },
100 created: function () { 100 created: function () {
101 - apiready = function () {  
102 - app.getQA()  
103 - } 101 + this.getQA()
104 }, 102 },
105 methods: { 103 methods: {
106 getQA: function () { 104 getQA: function () {
  105 + var app = this;
107 var post = {}; 106 var post = {};
108 - // var header = {  
109 - // 'XX-Device-Type': getDevice(),  
110 - // 'XX-Token': getToken()  
111 - // };  
112 var header = { 107 var header = {
113 "XX-Device-Type": getDevice(), 108 "XX-Device-Type": getDevice(),
114 'XX-Token': getToken() 109 'XX-Token': getToken()
115 }; 110 };
116 getRequest('post', 'user/index/getQA', post, header).then(function (res) { 111 getRequest('post', 'user/index/getQA', post, header).then(function (res) {
  112 +
117 if (res.data.code == 1) { 113 if (res.data.code == 1) {
  114 + for(var i in res.data.data){
  115 + res.data.data[i].ind = i
  116 + }
118 app.getQA_data = res.data.data; 117 app.getQA_data = res.data.data;
119 } 118 }
120 }) 119 })
121 }, 120 },
122 transform_fn: function (index) { 121 transform_fn: function (index) {
123 - if (app.ind == index) {  
124 - app.ind = -1 122 + var app = this;
  123 + // if (app.ind == index) {
  124 + // app.ind = -1
  125 + // } else {
  126 + // app.ind = index
  127 + // }
  128 + if (app.getQA_data[index].ind == index) {
  129 + app.getQA_data[index].ind = -1
125 } else { 130 } else {
126 - app.ind = index 131 + app.getQA_data[index].ind = index
127 } 132 }
128 } 133 }
129 } 134 }
@@ -3,21 +3,21 @@ @@ -3,21 +3,21 @@
3 <head> 3 <head>
4 <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"> 4 <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  6 + <!--<link rel="stylesheet" href="../../assets/css/jeDate-test.css">-->
  7 + <!--<link rel="stylesheet" href="../../assets/css/jedate.css">-->
6 <link rel="stylesheet" href="../../assets/css/weui.min.css"> 8 <link rel="stylesheet" href="../../assets/css/weui.min.css">
7 - <link rel="stylesheet" href="../../assets/css/jeDate-test.css">  
8 - <link rel="stylesheet" href="../../assets/css/jedate.css">  
9 <link rel="stylesheet" href="../../assets/css/base.css"> 9 <link rel="stylesheet" href="../../assets/css/base.css">
10 <link rel="stylesheet" href="../../assets/css/style1.css"> 10 <link rel="stylesheet" href="../../assets/css/style1.css">
11 <link rel="stylesheet" href="../../assets/css/common1.css"> 11 <link rel="stylesheet" href="../../assets/css/common1.css">
12 <link rel="stylesheet" href="../../assets/icon/iconfont.css"> 12 <link rel="stylesheet" href="../../assets/icon/iconfont.css">
13 13
  14 +
14 <title></title> 15 <title></title>
15 <style type="text/css"> 16 <style type="text/css">
16 body { 17 body {
17 background-color: #f5f5f5; 18 background-color: #f5f5f5;
18 margin: 0; 19 margin: 0;
19 } 20 }
20 -  
21 .sugar_type { 21 .sugar_type {
22 display: flex; 22 display: flex;
23 align-items: center; 23 align-items: center;
@@ -108,6 +108,11 @@ @@ -108,6 +108,11 @@
108 height:0.68rem; 108 height:0.68rem;
109 border:none; 109 border:none;
110 } 110 }
  111 + body .weui-toast{
  112 + min-height: 40px;
  113 + line-height: 40px;
  114 + top: 50%;
  115 + }
111 </style> 116 </style>
112 </head> 117 </head>
113 118
@@ -118,7 +123,7 @@ @@ -118,7 +123,7 @@
118 <div id="background"> 123 <div id="background">
119 <input type="number" step="0.1" name="test" class="knob" data-width="140" data-height='140' data-fgColor="#fff" 124 <input type="number" step="0.1" name="test" class="knob" data-width="140" data-height='140' data-fgColor="#fff"
120 data-skin="tron" 125 data-skin="tron"
121 - data-thickness=".1" value="0" placeholder=""> 126 + data-thickness=".1" value="0.0" placeholder="" id="circle_value">
122 </div> 127 </div>
123 </div> 128 </div>
124 <div class="sugar_type" data-type=""> 129 <div class="sugar_type" data-type="">
@@ -136,12 +141,9 @@ @@ -136,12 +141,9 @@
136 <!--<div class="iconfont icon-xiangyou"></div>--> 141 <!--<div class="iconfont icon-xiangyou"></div>-->
137 <!--</div>--> 142 <!--</div>-->
138 143
139 - <div class="jeitem ">  
140 - <div class="jelabel ">请选择测量时间</div>  
141 - <div class="date_box">  
142 - <!--<div class="jeinpbox" style="width:95%"><input type="text" class="jeinput" id="test04" placeholder="请选择测量时间" style="width:96%" readonly></div>-->  
143 - <!--<div class="iconfont icon-xiangyou" ></div>-->  
144 - <input type="datetime-local" id="chosetime" placeholder="请选择测量时间"> 144 + <div class="jeitem">
  145 + <div class="date_box" id="choose_time">
  146 + <input type="text" id="chosetime" placeholder="请选择测量时间">
145 </div> 147 </div>
146 </div> 148 </div>
147 149
@@ -152,6 +154,7 @@ @@ -152,6 +154,7 @@
152 154
153 155
154 <script type="text/javascript" src="../../assets/js/api.js"></script> 156 <script type="text/javascript" src="../../assets/js/api.js"></script>
  157 +<script type="text/javascript" src="../../assets/js/weui.min.js"></script>
155 <script type="text/javascript" src="../../assets/js/public.js"></script> 158 <script type="text/javascript" src="../../assets/js/public.js"></script>
156 <script type="text/javascript" src="../../assets/js/fastclick.js"></script> 159 <script type="text/javascript" src="../../assets/js/fastclick.js"></script>
157 <script> 160 <script>
@@ -161,166 +164,149 @@ @@ -161,166 +164,149 @@
161 <script src="../../assets/js/jquery.knob.js" type="text/javascript"></script> 164 <script src="../../assets/js/jquery.knob.js" type="text/javascript"></script>
162 <script type="text/javascript" src="../../assets/js/axios.min.js"></script> 165 <script type="text/javascript" src="../../assets/js/axios.min.js"></script>
163 <script type="text/javascript" src="../../assets/icon/iconfont.js"></script> 166 <script type="text/javascript" src="../../assets/icon/iconfont.js"></script>
  167 +<script type="text/javascript" src="../../assets/js/datePicker.js"></script>
164 <script type="text/javascript" src="../../assets/js/jedate.js"></script> 168 <script type="text/javascript" src="../../assets/js/jedate.js"></script>
165 -<!--<script type="text/javascript" src="../../assets/js/demo.js"></script>-->  
166 -<script type="text/javascript" src="../../assets/js/weui.min.js"></script>  
167 <script type="text/javascript"> 169 <script type="text/javascript">
168 - $(function () {  
169 - // apiready = function () {  
170 - $(document).ready(function () {  
171 -  
172 - var type=1  
173 - $(".knob").knob();  
174 - loadEnd();  
175 - var rid=localStorage.getItem("rid")  
176 -  
177 - function getSugar() {  
178 - var header = {  
179 - "XX-Device-Type": getDevice(),  
180 - 'XX-Token': getToken()  
181 - };  
182 - var post = {  
183 - rid: rid,  
184 - type: 1  
185 - };  
186 - getRequest('post', 'user/index/getLastBoolData', post, header).then(function (res) { 170 + $(document).ready(function () {
  171 + var type=1
  172 + $(".knob").knob();
  173 + loadEnd();
  174 + var rid=localStorage.getItem("rid")
  175 +
  176 + function getSugar() {
  177 + var header = {
  178 + "XX-Device-Type": getDevice(),
  179 + 'XX-Token': getToken()
  180 + };
  181 + var post = {
  182 + rid: rid,
  183 + type: 1
  184 + };
  185 + getRequest('post', 'user/index/getLastBoolData', post, header).then(function (res) {
  186 + if (res.data.code == 1) {
  187 + $('.knob').val(res.data.data.data);
  188 + $('.date_item').text(res.data.data.time);
  189 + $('.sugar_type span').removeClass('spanactive').eq(res.data.data.time_type-1).addClass('spanactive');
  190 + } else {
  191 + toastMsg(res.data.msg)
  192 + }
  193 + })
  194 + }
  195 +
  196 + getSugar();
  197 + $('.sugar_type span').click(function () {
  198 + $(this).addClass('spanactive').siblings().removeClass('spanactive');
  199 + if ($(this).hasClass('spanactive')) {
  200 + $('.sugar_type').attr('data-type', $(this).attr('data-id'))
  201 + } else {
  202 + $('.sugar_type').removeAttribute('data-type')
  203 + }
  204 + });
  205 + $('.date_box').click(function () {
  206 +
  207 + // if (api.systemType == 'ios') {
  208 + // api.openPicker({
  209 + // type: 'date_time',
  210 + // date: new Date(),
  211 + // maxDate: getTimeDetil(0),
  212 + // title: '测量时间'
  213 + // }, function (ret, err) {
  214 + // console.log(ret)
  215 + // if (ret) {
  216 + // var year = ret.year;
  217 + // var month = ret.month;
  218 + // var day = ret.day;
  219 + // var hour = ret.hour;
  220 + // var minute = ret.minute;
  221 + // var date_info = year + '-' + add0(month) + '-' + add0(day) + ' ' + add0(hour) + ':' + add0(minute);
  222 + // if (checkDate(date_info, 2)) {
  223 + // $('.date_item').html(date_info)
  224 + // } else {
  225 + // toastMsg('选择日期不能大于当前时间');
  226 + // $('.date_item').html('请选择测量时间')
  227 + // }
  228 + // } else {
  229 + // console.log(err)
  230 + // }
  231 + // });
  232 + // }
  233 + // else {
  234 + // api.openPicker({
  235 + // type: 'date',
  236 + // title: '服务日期',
  237 + // }, function (ret, err) {
  238 + // if (ret) {
  239 + // var year = ret.year;
  240 + // var month = ret.month;
  241 + // var day = ret.day;
  242 + // api.openPicker({
  243 + // type: 'time',
  244 + // title: '服务时间'
  245 + // }, function (rets, errs) {
  246 + // if (rets) {
  247 + // var hour = rets.hour;
  248 + // var minute = rets.minute;
  249 + // var date_info = year + '-' + add0(month) + '-' + add0(day) + ' ' + add0(hour) + ':' + add0(minute);
  250 + // if (checkDate(date_info, 2)) {
  251 + // $('.date_item').html(date_info);
  252 + // } else {
  253 + // toastMsg('选择日期不能大于当前时间');
  254 + // $('.date_item').html('请选择测量时间')
  255 + // }
  256 + // } else {
  257 + // console.log(errs)
  258 + // }
  259 + // });
  260 + // } else {
  261 + // console.log(err)
  262 + // }
  263 + // });
  264 + // }
  265 +
  266 +
  267 +
  268 + });
  269 +
  270 + $('.save_btn').click(function () {
  271 + var rid=localStorage.getItem("rid");
  272 + var value = $('.knob').val();
  273 + var date = $('#chosetime').val();
  274 + date=date.split("T");
  275 + date=date[0]+" " +date[1];
  276 + type = $('.spanactive').attr('data-id')
  277 + // console.log(type)
  278 + var post = {
  279 + rid: rid,
  280 + time_type: type,
  281 + time: date,
  282 + data: value,
  283 + type:1
  284 + };
  285 + var header = {
  286 + "XX-Device-Type": getDevice(),
  287 + 'XX-Token': getToken()
  288 + };
  289 + if (value == '') {
  290 + toastMsg('请记录血糖值');
  291 + return false
  292 + } else if (type == '') {
  293 + toastMsg('请选择选择测量节点');
  294 + return false
  295 + }
  296 + else if (date == '') {
  297 + toastMsg('请选择测量时间');
  298 + return false
  299 + } else {
  300 + getRequest('post', 'user/index/setBoolData', post, header).then(function (res) {
187 // alert(JSON.stringify(res)) 301 // alert(JSON.stringify(res))
188 if (res.data.code == 1) { 302 if (res.data.code == 1) {
189 - $('.knob').val(res.data.data.data);  
190 - $('.date_item').text(res.data.data.time);  
191 - $('.sugar_type span').removeClass('spanactive').eq(res.data.data.time_type-1).addClass('spanactive'); 303 + toastMsg('记录成功');
192 } else { 304 } else {
193 toastMsg(res.data.msg) 305 toastMsg(res.data.msg)
194 } 306 }
  307 + console.log($('.weui-toast').html())
195 }) 308 })
196 } 309 }
197 -  
198 - getSugar();  
199 - $('.sugar_type span').click(function () {  
200 - $(this).addClass('spanactive').siblings().removeClass('spanactive');  
201 - if ($(this).hasClass('spanactive')) {  
202 - $('.sugar_type').attr('data-type', $(this).attr('data-id'))  
203 - } else {  
204 - $('.sugar_type').removeAttribute('data-type')  
205 - }  
206 - });  
207 - $('.date_box').click(function () {  
208 -  
209 - // if (api.systemType == 'ios') {  
210 - // api.openPicker({  
211 - // type: 'date_time',  
212 - // date: new Date(),  
213 - // maxDate: getTimeDetil(0),  
214 - // title: '测量时间'  
215 - // }, function (ret, err) {  
216 - // console.log(ret)  
217 - // if (ret) {  
218 - // var year = ret.year;  
219 - // var month = ret.month;  
220 - // var day = ret.day;  
221 - // var hour = ret.hour;  
222 - // var minute = ret.minute;  
223 - // var date_info = year + '-' + add0(month) + '-' + add0(day) + ' ' + add0(hour) + ':' + add0(minute);  
224 - // if (checkDate(date_info, 2)) {  
225 - // $('.date_item').html(date_info)  
226 - // } else {  
227 - // toastMsg('选择日期不能大于当前时间');  
228 - // $('.date_item').html('请选择测量时间')  
229 - // }  
230 - // } else {  
231 - // console.log(err)  
232 - // }  
233 - // });  
234 - // }  
235 - // else {  
236 - // api.openPicker({  
237 - // type: 'date',  
238 - // title: '服务日期',  
239 - // }, function (ret, err) {  
240 - // if (ret) {  
241 - // var year = ret.year;  
242 - // var month = ret.month;  
243 - // var day = ret.day;  
244 - // api.openPicker({  
245 - // type: 'time',  
246 - // title: '服务时间'  
247 - // }, function (rets, errs) {  
248 - // if (rets) {  
249 - // var hour = rets.hour;  
250 - // var minute = rets.minute;  
251 - // var date_info = year + '-' + add0(month) + '-' + add0(day) + ' ' + add0(hour) + ':' + add0(minute);  
252 - // if (checkDate(date_info, 2)) {  
253 - // $('.date_item').html(date_info);  
254 - // } else {  
255 - // toastMsg('选择日期不能大于当前时间');  
256 - // $('.date_item').html('请选择测量时间')  
257 - // }  
258 - // } else {  
259 - // console.log(errs)  
260 - // }  
261 - // });  
262 - // } else {  
263 - // console.log(err)  
264 - // }  
265 - // });  
266 - // }  
267 -  
268 -  
269 -  
270 - });  
271 -  
272 - $('.save_btn').click(function () {  
273 - var rid=localStorage.getItem("rid")  
274 - var value = $('.knob').val();  
275 -  
276 - var date = $('#chosetime').val();  
277 -  
278 - date=date.split("T");  
279 - date=date[0]+" " +date[1];  
280 -  
281 -  
282 -  
283 - // type = $('.sugar_type').attr('data-type');  
284 - type = $('.spanactive').attr('data-id')  
285 - // console.log(type)  
286 - var post = {  
287 - rid: rid,  
288 - time_type: type,  
289 - time: date,  
290 - data: value,  
291 - type:1  
292 - };  
293 - var header = {  
294 - "XX-Device-Type": getDevice(),  
295 - 'XX-Token': getToken()  
296 - };  
297 - if (value == '') {  
298 - toastMsg('请记录血糖值')  
299 - } else if (type == '') {  
300 - toastMsg('请选择具体测试时间')  
301 - }  
302 - else if (date == '') {  
303 - toastMsg('请选择测量时间')  
304 - } else {  
305 - getRequest('post', 'user/index/setBoolData', post, header).then(function (res) {  
306 - // alert(JSON.stringify(res))  
307 - if (res.data.code == 1) {  
308 - toastMsg('记录成功');  
309 - setTimeout(function () {  
310 - api.sendEvent({  
311 - name: 'sugar',  
312 - });  
313 - api.closeWin()  
314 - }, 1000)  
315 - } else {  
316 - toastMsg(res.data.msg)  
317 - }  
318 - })  
319 - }  
320 - });  
321 -  
322 -  
323 - })  
324 - // }  
325 - }); 310 + });
  311 + })
326 </script> 312 </script>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 position: fixed; 162 position: fixed;
163 width: 100%; 163 width: 100%;
164 left: 0; 164 left: 0;
165 - bottom: 0; 165 + bottom: 1.3rem;
166 z-index: 2; 166 z-index: 2;
167 /*border-top: 1px solid #fff;*/ 167 /*border-top: 1px solid #fff;*/
168 } 168 }
@@ -439,8 +439,10 @@ @@ -439,8 +439,10 @@
439 }) 439 })
440 }, 440 },
441 // 切换底部导航 441 // 切换底部导航
442 - changeTab: function (res) { 442 + changeTab: function (index) {
443 //跳转页面 443 //跳转页面
  444 + var url = index == 0 ? '../index/index_f.html' : index == 1 ? '../strict/strict_f.html' : '../my/my_f.html';
  445 + window.location.href = url
444 } 446 }
445 } 447 }
446 }) 448 })