Merge branch 'master' of http://114.215.101.231:8099/dingling/A6079080424317 into lihongjuan
正在显示
10 个修改的文件
包含
666 行增加
和
162 行删除
@@ -243,10 +243,6 @@ footer { | @@ -243,10 +243,6 @@ footer { | ||
243 | overflow: hidden; | 243 | overflow: hidden; |
244 | } | 244 | } |
245 | 245 | ||
246 | -.swiper-container { | ||
247 | - overflow: hidden; | ||
248 | -} | ||
249 | - | ||
250 | .swiper_title { | 246 | .swiper_title { |
251 | display: flex; | 247 | display: flex; |
252 | align-items: center; | 248 | align-items: center; |
@@ -281,17 +277,17 @@ footer { | @@ -281,17 +277,17 @@ footer { | ||
281 | } | 277 | } |
282 | 278 | ||
283 | .swiper_item { | 279 | .swiper_item { |
284 | - /*display: flex;*/ | ||
285 | - /*align-items: center;*/ | ||
286 | - /*justify-content: space-between;*/ | ||
287 | - /*font-size: 14px;*/ | ||
288 | - /*color: #424242;*/ | ||
289 | - /*padding: 14px 12px 14px 0;*/ | 280 | + display: flex; |
281 | + align-items: center; | ||
282 | + justify-content: space-between; | ||
283 | + font-size: 14px; | ||
284 | + color: #424242; | ||
285 | + padding: 0 7px; | ||
290 | /*margin: 0 7px;*/ | 286 | /*margin: 0 7px;*/ |
291 | border-top: 1px solid #ececec; | 287 | border-top: 1px solid #ececec; |
292 | box-sizing: border-box; | 288 | box-sizing: border-box; |
293 | background-color: #fff; | 289 | background-color: #fff; |
294 | - /*width: 100%;*/ | 290 | + width: 100%; |
295 | } | 291 | } |
296 | 292 | ||
297 | .swiper_item_img { | 293 | .swiper_item_img { |
@@ -7,11 +7,12 @@ var mobileReg = /^1(3[0-9]|4[57]|5[0-35-9]|7[0135678]|8[0-9])\d{8}$/; //手机 | @@ -7,11 +7,12 @@ var mobileReg = /^1(3[0-9]|4[57]|5[0-35-9]|7[0135678]|8[0-9])\d{8}$/; //手机 | ||
7 | var id_card = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;//身份证正则 | 7 | var id_card = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;//身份证正则 |
8 | 8 | ||
9 | 9 | ||
10 | -function openWin(winName, url) { | ||
11 | - api.openWin({ | ||
12 | - name: winName, | ||
13 | - url: url | ||
14 | - }); | 10 | +function openWin(data) { |
11 | + | ||
12 | + for(var item in data.pageParam){ | ||
13 | + localStorage.setItem(item,data.pageParam[item]) | ||
14 | + } | ||
15 | + window.location.href = data.url | ||
15 | } | 16 | } |
16 | 17 | ||
17 | function openView(fmName, fmUrl, winTitle, winName, winUrl, fmParams, winParams) { | 18 | function openView(fmName, fmUrl, winTitle, winName, winUrl, fmParams, winParams) { |
@@ -86,13 +86,13 @@ | @@ -86,13 +86,13 @@ | ||
86 | <div id="loadStart"></div> | 86 | <div id="loadStart"></div> |
87 | 87 | ||
88 | <div id="app" v-cloak> | 88 | <div id="app" v-cloak> |
89 | - <header id="header"> | ||
90 | - <div class="index_header"> | ||
91 | - <div class="close_left" onclick="closeWindow()"><span class="iconfont icon-fanhui"></span></div> | ||
92 | - <span>{{post_title}}</span> | ||
93 | - <span class="iconfont icon-fenxiang-tianchong" ></span> | ||
94 | - </div> | ||
95 | - </header> | 89 | + <!--<header id="header">--> |
90 | + <!--<div class="index_header">--> | ||
91 | + <!--<div class="close_left" onclick="closeWindow()"><span class="iconfont icon-fanhui"></span></div>--> | ||
92 | + <!--<span>{{post_title}}</span>--> | ||
93 | + <!--<span class="iconfont icon-fenxiang-tianchong" ></span>--> | ||
94 | + <!--</div>--> | ||
95 | + <!--</header>--> | ||
96 | <div class="warp"> | 96 | <div class="warp"> |
97 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> | 97 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> |
98 | <!--<div class="nurse_text">{{post_title}}</div>--> | 98 | <!--<div class="nurse_text">{{post_title}}</div>--> |
@@ -151,6 +151,8 @@ | @@ -151,6 +151,8 @@ | ||
151 | <script type="text/javascript" src="../../assets/js/axios.min.js"></script> | 151 | <script type="text/javascript" src="../../assets/js/axios.min.js"></script> |
152 | <script type="text/javascript" src="../../assets/icon/iconfont.js"></script> | 152 | <script type="text/javascript" src="../../assets/icon/iconfont.js"></script> |
153 | <script> | 153 | <script> |
154 | + var title = document.getElementsByTagName("title")[0] | ||
155 | + | ||
154 | var app = new Vue({ | 156 | var app = new Vue({ |
155 | el: '#app', | 157 | el: '#app', |
156 | data: { | 158 | data: { |
@@ -208,7 +210,7 @@ | @@ -208,7 +210,7 @@ | ||
208 | }, | 210 | }, |
209 | // 获取详情 | 211 | // 获取详情 |
210 | proCareInfoInfo: function () { | 212 | proCareInfoInfo: function () { |
211 | - var app = this | 213 | + var app = this; |
212 | var post = { | 214 | var post = { |
213 | id: app.id | 215 | id: app.id |
214 | }; | 216 | }; |
@@ -227,6 +229,7 @@ | @@ -227,6 +229,7 @@ | ||
227 | // app.banner = app.proCareInfoInfo_data.banner | 229 | // app.banner = app.proCareInfoInfo_data.banner |
228 | } | 230 | } |
229 | }) | 231 | }) |
232 | + | ||
230 | }, | 233 | }, |
231 | // 获取个人的基本信息 | 234 | // 获取个人的基本信息 |
232 | getUserIndexInfo: function () { | 235 | getUserIndexInfo: function () { |
@@ -250,7 +253,13 @@ | @@ -250,7 +253,13 @@ | ||
250 | name: 'cs_win', | 253 | name: 'cs_win', |
251 | url: '../common/cs_win.html' | 254 | url: '../common/cs_win.html' |
252 | }); | 255 | }); |
256 | + } | ||
253 | }, | 257 | }, |
258 | + watch:{ | ||
259 | + post_title(curVal,oldVal){ | ||
260 | + // title.innerText = this.post_title; | ||
261 | + document.title = this.post_title; | ||
262 | + } | ||
254 | } | 263 | } |
255 | }) | 264 | }) |
256 | </script> | 265 | </script> |
@@ -424,14 +424,14 @@ | @@ -424,14 +424,14 @@ | ||
424 | app.num-- | 424 | app.num-- |
425 | } | 425 | } |
426 | }, | 426 | }, |
427 | - plus: function () { | 427 | + t_plus: function () { |
428 | if (app.num < app.priceList.limit_num) { | 428 | if (app.num < app.priceList.limit_num) { |
429 | app.num++ | 429 | app.num++ |
430 | } else { | 430 | } else { |
431 | toastMsg('不能超过最大限购哦') | 431 | toastMsg('不能超过最大限购哦') |
432 | } | 432 | } |
433 | }, | 433 | }, |
434 | - pay_go: function () { | 434 | + t_pay_go: function () { |
435 | if (app.active_name != '') { | 435 | if (app.active_name != '') { |
436 | api.sendEvent({ | 436 | api.sendEvent({ |
437 | name: 'meal', | 437 | name: 'meal', |
1 | -<!doctype html> | ||
2 | -<html lang="en"> | ||
3 | -<head> | 1 | + <head> |
4 | <meta charset="UTF-8"> | 2 | <meta charset="UTF-8"> |
5 | <meta name="viewport" | 3 | <meta name="viewport" |
6 | content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> | 4 | content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> |
@@ -30,13 +28,13 @@ | @@ -30,13 +28,13 @@ | ||
30 | <body> | 28 | <body> |
31 | <div id="loadStart"></div> | 29 | <div id="loadStart"></div> |
32 | <div id="app" v-cloak> | 30 | <div id="app" v-cloak> |
33 | - <header id="header"> | ||
34 | - <div class="index_header white_bg"> | ||
35 | - <div class="close_left" onclick="closeWindow()"><span class="iconfont icon-fanhui"></span></div> | ||
36 | - <div class="win_mid">{{winTitle}}</div> | ||
37 | - <div></div> | ||
38 | - </div> | ||
39 | - </header> | 31 | + <!--<header id="header">--> |
32 | + <!--<div class="index_header white_bg">--> | ||
33 | + <!--<div class="close_left" onclick="closeWindow()"><span class="iconfont icon-fanhui"></span></div>--> | ||
34 | + <!--<div class="win_mid">{{winTitle}}</div>--> | ||
35 | + <!--<div></div>--> | ||
36 | + <!--</div>--> | ||
37 | + <!--</header> --> | ||
40 | <div class="warp"> | 38 | <div class="warp"> |
41 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> | 39 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> |
42 | <!--<div class="nurse_text">{{name}}</div>--> | 40 | <!--<div class="nurse_text">{{name}}</div>--> |
@@ -112,13 +110,15 @@ | @@ -112,13 +110,15 @@ | ||
112 | this.cid = localStorage.getItem('cid'); | 110 | this.cid = localStorage.getItem('cid'); |
113 | this.cityname = localStorage.getItem('cityName'); | 111 | this.cityname = localStorage.getItem('cityName'); |
114 | this.winTitle = localStorage.getItem('winTitle'); | 112 | this.winTitle = localStorage.getItem('winTitle'); |
113 | + document.getElementsByTagName("title")[0].innerText = this.winTitle; | ||
115 | this.getCatInfo2(); | 114 | this.getCatInfo2(); |
116 | }, | 115 | }, |
117 | methods: { | 116 | methods: { |
118 | openDoc: function (id) { | 117 | openDoc: function (id) { |
119 | - api.openWin({ | 118 | + console.log(id) |
119 | + openWin({ | ||
120 | name: 'care_w', | 120 | name: 'care_w', |
121 | - url: './care_w.html', | 121 | + url: 'care_f.html', |
122 | pageParam: { | 122 | pageParam: { |
123 | id: id, | 123 | id: id, |
124 | cid: this.cid, | 124 | cid: this.cid, |
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> | 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"> | 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 | - <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/api.css"/> | 11 | <link rel="stylesheet" href="../../assets/css/api.css"/> |
12 | <link rel="stylesheet" href="../../assets/css/index.css"> | 12 | <link rel="stylesheet" href="../../assets/css/index.css"> |
@@ -35,13 +35,13 @@ | @@ -35,13 +35,13 @@ | ||
35 | <body> | 35 | <body> |
36 | <div id="loadStart"></div> | 36 | <div id="loadStart"></div> |
37 | <div id="app"> | 37 | <div id="app"> |
38 | - <header id="header"> | ||
39 | - <div class="index_header"> | ||
40 | - <span class="iconfont icon-fanhui" onclick="closeWindow()"></span> | ||
41 | - <span>家庭医生</span> | ||
42 | - <span class="iconfont icon-fenxiang-tianchong" ></span> | ||
43 | - </div> | ||
44 | - </header> | 38 | + <!--<header id="header">--> |
39 | + <!--<div class="index_header">--> | ||
40 | + <!--<span class="iconfont icon-fanhui" onclick="closeWindow()"></span>--> | ||
41 | + <!--<span></span>--> | ||
42 | + <!--<span class="iconfont icon-fenxiang-tianchong" ></span>--> | ||
43 | + <!--</div>--> | ||
44 | + <!--</header>--> | ||
45 | <div class="warp"> | 45 | <div class="warp"> |
46 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> | 46 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> |
47 | <!--<div class="nurse_text">{{name}}</div>--> | 47 | <!--<div class="nurse_text">{{name}}</div>--> |
@@ -42,6 +42,314 @@ | @@ -42,6 +42,314 @@ | ||
42 | .swiper_item { | 42 | .swiper_item { |
43 | /*padding: 0.28rem 0.25rem;*/ | 43 | /*padding: 0.28rem 0.25rem;*/ |
44 | } | 44 | } |
45 | + .meal { | ||
46 | + display: flex; | ||
47 | + flex-direction: column; | ||
48 | + justify-content: flex-end; | ||
49 | + position: fixed; | ||
50 | + top: 0; | ||
51 | + left: 0; | ||
52 | + width: 100%; | ||
53 | + height: 100%; | ||
54 | + z-index: 100; | ||
55 | + background-color: rgba(0,0,0,.5); | ||
56 | + } | ||
57 | + | ||
58 | + .meal_title { | ||
59 | + text-align: center; | ||
60 | + color: #424242; | ||
61 | + font-size: 15px; | ||
62 | + font-weight: bold; | ||
63 | + border-bottom: 1px solid #ccc; | ||
64 | + display: flex; | ||
65 | + align-items: center; | ||
66 | + justify-content: space-between; | ||
67 | + padding: 0.25rem; | ||
68 | + } | ||
69 | + | ||
70 | + .meal_price_box { | ||
71 | + display: flex; | ||
72 | + align-items: center; | ||
73 | + justify-content: space-between; | ||
74 | + font-size: 12px; | ||
75 | + color: #424242; | ||
76 | + padding: 0.25rem 10% 0 10%; | ||
77 | + } | ||
78 | + | ||
79 | + .meal_price { | ||
80 | + color: #d8b25f; | ||
81 | + font-size: 9px; | ||
82 | + margin-left: 0.1rem; | ||
83 | + } | ||
84 | + | ||
85 | + .incer { | ||
86 | + color: #ccc; | ||
87 | + font-size: 9px; | ||
88 | + padding: 0 10%; | ||
89 | + } | ||
90 | + | ||
91 | + .sever_list { | ||
92 | + display: flex; | ||
93 | + align-items: center; | ||
94 | + flex-wrap: wrap; | ||
95 | + font-size: 12px; | ||
96 | + padding: 0.25rem 10%; | ||
97 | + } | ||
98 | + | ||
99 | + .sever_list span { | ||
100 | + background-color: #f2f2f2; | ||
101 | + padding: 0.1rem 0.2rem; | ||
102 | + margin: 0 0.2rem 0.2rem 0; | ||
103 | + border-radius: 0.07rem; | ||
104 | + } | ||
105 | + | ||
106 | + .sever_list .span_active { | ||
107 | + background-color: #dbb25f; | ||
108 | + color: #fff; | ||
109 | + } | ||
110 | + | ||
111 | + .meal_item { | ||
112 | + background-color: #fff; | ||
113 | + } | ||
114 | + | ||
115 | + .pay_box { | ||
116 | + display: flex; | ||
117 | + align-items: center; | ||
118 | + justify-content: space-between; | ||
119 | + padding: 0 10% 0.25rem 10%; | ||
120 | + } | ||
121 | + | ||
122 | + .pay_num { | ||
123 | + font-size: 12px; | ||
124 | + color: #424242; | ||
125 | + } | ||
126 | + | ||
127 | + .pay_btn_box { | ||
128 | + display: flex; | ||
129 | + align-items: center; | ||
130 | + | ||
131 | + } | ||
132 | + | ||
133 | + .pay_btn_box .iconfont { | ||
134 | + font-size: 20px; | ||
135 | + color: #ccc; | ||
136 | + } | ||
137 | + | ||
138 | + .pay_btn_box input { | ||
139 | + width: 0.5rem; | ||
140 | + text-align: center; | ||
141 | + border: 0; | ||
142 | + outline: none; | ||
143 | + font-size: 15px; | ||
144 | + } | ||
145 | + | ||
146 | + .pay_num .limit { | ||
147 | + padding: 0; | ||
148 | + font-size: 9px; | ||
149 | + color: #ccc; | ||
150 | + } | ||
151 | + | ||
152 | + .price { | ||
153 | + flex: 1; | ||
154 | + text-align: right; | ||
155 | + } | ||
156 | + | ||
157 | + .price .meal_price { | ||
158 | + font-size: 12px; | ||
159 | + } | ||
160 | + | ||
161 | + .price .old_price { | ||
162 | + text-decoration: line-through; | ||
163 | + color: #ccc; | ||
164 | + margin-left: 0.1rem; | ||
165 | + } | ||
166 | + | ||
167 | + .pay_btn { | ||
168 | + font-size: 15px; | ||
169 | + color: #fff; | ||
170 | + background-color: #dbb25f; | ||
171 | + text-align: center; | ||
172 | + padding: 0.2rem 0; | ||
173 | + } | ||
174 | + | ||
175 | + .icon-cuohao { | ||
176 | + font-size: 15px; | ||
177 | + color: #424242; | ||
178 | + } | ||
179 | + | ||
180 | + .save_btn { | ||
181 | + text-align: center; | ||
182 | + font-size: 0.36rem; | ||
183 | + color: #fff; | ||
184 | + padding: 0.15rem 0; | ||
185 | + width: 100%; | ||
186 | + position: absolute; | ||
187 | + left: 0; | ||
188 | + bottom: 0; | ||
189 | + z-index: 100; | ||
190 | + background-color: #dbb25f; | ||
191 | + } | ||
192 | + | ||
193 | + .moreoul { | ||
194 | + width: 100%; | ||
195 | + } | ||
196 | + | ||
197 | + .moreoul li { | ||
198 | + width: 100%; | ||
199 | + padding: 0.3rem 0; | ||
200 | + line-height: 0.3rem; | ||
201 | + font-size: 16px; | ||
202 | + border-bottom: 1px solid #f0f0f0; | ||
203 | + text-align: center; | ||
204 | + } | ||
205 | + | ||
206 | + .nodata { | ||
207 | + font-size: 16px; | ||
208 | + color: #c0c0c0; | ||
209 | + text-align: center; | ||
210 | + padding: 0.5rem 0; | ||
211 | + width: 100% !important; | ||
212 | + } | ||
213 | + | ||
214 | + .weui-picker__indicator:after { | ||
215 | + border-bottom: 1px solid #dbb25f; | ||
216 | + } | ||
217 | + | ||
218 | + .weui-picker__indicator:before { | ||
219 | + border-top: 1px solid #dbb25f; | ||
220 | + } | ||
221 | + | ||
222 | + .weui-picker__action { | ||
223 | + padding: 0.2rem 0; | ||
224 | + font-size: 13px; | ||
225 | + text-align: center; | ||
226 | + } | ||
227 | + | ||
228 | + .weui-picker__action:first-child { | ||
229 | + color: #333; | ||
230 | + text-align: center; | ||
231 | + } | ||
232 | + | ||
233 | + .weui-picker__action:last-child { | ||
234 | + color: #fff; | ||
235 | + text-align: center; | ||
236 | + background-color: #dbb25f; | ||
237 | + } | ||
238 | + | ||
239 | + .weui-picker__hd { | ||
240 | + padding: 0; | ||
241 | + } | ||
242 | + | ||
243 | + .weui-picker__item { | ||
244 | + font-size: 13px; | ||
245 | + } | ||
246 | + | ||
247 | + .close_left { | ||
248 | + position: relative; | ||
249 | + } | ||
250 | + | ||
251 | + .close_left::before { | ||
252 | + position: absolute; | ||
253 | + left: -0.1rem; | ||
254 | + right: -0.1rem; | ||
255 | + top: -0.1rem; | ||
256 | + bottom: -0.1rem; | ||
257 | + content: ''; | ||
258 | + } | ||
259 | + | ||
260 | + .mint-popup-bottom { | ||
261 | + width: 100%; | ||
262 | + } | ||
263 | + | ||
264 | + .weui-check__label:active { | ||
265 | + background: transparent; | ||
266 | + } | ||
267 | + | ||
268 | + .weui-cells_checkbox .weui-icon-checked:before { | ||
269 | + /*content: '';*/ | ||
270 | + } | ||
271 | + | ||
272 | + .weui-cells_checkbox .weui-check:checked + .weui-icon-checked:before { | ||
273 | + color: #dbb25f | ||
274 | + } | ||
275 | + | ||
276 | + .weui-cell__hd { | ||
277 | + position: relative; | ||
278 | + } | ||
279 | + | ||
280 | + .weui-cell__hd::before { | ||
281 | + content: ''; | ||
282 | + position: absolute; | ||
283 | + left: -10px; | ||
284 | + right: -10px; | ||
285 | + top: -10px; | ||
286 | + bottom: -10px; | ||
287 | + } | ||
288 | + | ||
289 | + .mold_index { | ||
290 | + position: fixed; | ||
291 | + height: 100%; | ||
292 | + width: 100%; | ||
293 | + background-color: rgba(0, 0, 0, 0.05); | ||
294 | + /*background-color: #000;*/ | ||
295 | + left: 0; | ||
296 | + top: 0; | ||
297 | + bottom: 0; | ||
298 | + z-index: 10; | ||
299 | + } | ||
300 | + | ||
301 | + .weui-mask, .weui-mask_transparent { | ||
302 | + position: fixed; | ||
303 | + z-index: 1000; | ||
304 | + top: 0; | ||
305 | + right: 0; | ||
306 | + left: 0; | ||
307 | + bottom: 0; | ||
308 | + width: 100%; | ||
309 | + height: 100%; | ||
310 | + display: flex; | ||
311 | + align-items: center; | ||
312 | + justify-content: center; | ||
313 | + } | ||
314 | + | ||
315 | + .weui-toast { | ||
316 | + position: fixed; | ||
317 | + z-index: 5000; | ||
318 | + width: 40%; | ||
319 | + min-width: 20%; | ||
320 | + min-height: auto; | ||
321 | + height: auto; | ||
322 | + top: 50%; | ||
323 | + left: 0; | ||
324 | + right: 0; | ||
325 | + margin: 0 auto; | ||
326 | + /*margin-left: -3.8em;*/ | ||
327 | + background: hsla(0, 0%, 7%, .7); | ||
328 | + text-align: center; | ||
329 | + border-radius: 5px; | ||
330 | + color: #fff; | ||
331 | + font-size: 14px; | ||
332 | + } | ||
333 | + | ||
334 | + .weui-icon_toast { | ||
335 | + margin: 0; | ||
336 | + /*display: block*/ | ||
337 | + } | ||
338 | + | ||
339 | + .weui-toast__content { | ||
340 | + margin: 0; | ||
341 | + padding: 0.1rem 0; | ||
342 | + } | ||
343 | + | ||
344 | + .weui-icon_toast.weui-icon-success-no-circle { | ||
345 | + font-size: 0; | ||
346 | + } | ||
347 | + | ||
348 | + .weui-icon_toast.weui-icon-success-no-circle:before { | ||
349 | + color: #fff; | ||
350 | + font-size: 0; | ||
351 | + margin: 0; | ||
352 | + } | ||
45 | </style> | 353 | </style> |
46 | </head> | 354 | </head> |
47 | <body> | 355 | <body> |
@@ -105,10 +413,79 @@ | @@ -105,10 +413,79 @@ | ||
105 | <span class="doc_appointment" @click="openOrder" v-else>去 预 约</span> | 413 | <span class="doc_appointment" @click="openOrder" v-else>去 预 约</span> |
106 | </div> | 414 | </div> |
107 | </footer> | 415 | </footer> |
416 | + <!--预约--> | ||
417 | + <div @click="close" class="meal" v-if="room"> | ||
418 | + <div class="meal_item" @click.stop> | ||
419 | + <div class="meal_title"> | ||
420 | + <span></span> | ||
421 | + <span>入住选择</span> | ||
422 | + <span class="iconfont icon-cuohao" @click="close"></span> | ||
423 | + </div> | ||
424 | + <div class="room_box"> | ||
425 | + <div class="room_left"> | ||
426 | + <div><span>服务价格</span><span class="youhui">优惠¥{{price_info.count?price_info.count:0}}</span></div> | ||
427 | + </div> | ||
428 | + <div class="room_right"> | ||
429 | + <span>¥{{price_info.price?price_info.price:0}}</span> | ||
430 | + <span class="old_price">原价{{price_info.o_price?price_info.o_price:0}}</span> | ||
431 | + </div> | ||
432 | + </div> | ||
433 | + <div class="room_tips">此价格包含护理、房间、用餐费用</div> | ||
434 | + <div class="price_box"> | ||
435 | + <div class="price_left"> | ||
436 | + <span :class="{'span_active':index==active_index}" | ||
437 | + v-for="(item,index) in attribute[0]" | ||
438 | + @click="choose_left(index)">{{item}}</span> | ||
439 | + </div> | ||
440 | + <div class="price_right"> | ||
441 | + <span :class="{'span_active':index==active_index2}" | ||
442 | + v-for="(item,index) in attribute[1]" | ||
443 | + @click="choose_right(index)">{{item}}</span> | ||
444 | + </div> | ||
445 | + </div> | ||
446 | + <div class="pay_box"> | ||
447 | + <span class="pay_num">入住周期 <span | ||
448 | + class="limit">({{price_info.limit_num?price_info.limit_num:0}}{{unit}})</span></span> | ||
449 | + <div class="pay_btn_box"> | ||
450 | + <span class="iconfont icon-jian" @click="reduce"></span> | ||
451 | + <input type="number" placeholder="" value="1" v-model="num"> | ||
452 | + <span class="iconfont icon-jikediancanicon09" @click="plus"></span> | ||
453 | + </div> | ||
454 | + </div> | ||
455 | + <div class="pay_btn" @click.stop="pay_go">确定</div> | ||
456 | + </div> | ||
457 | + </div> | ||
458 | + <div @click="close" class="meal" v-if="taocan"> | ||
459 | + <div class="meal_item" @click.stop> | ||
460 | + <div class="meal_title"><span></span><span>选择套餐</span><span class="iconfont icon-cuohao" | ||
461 | + @click="close"></span></div> | ||
462 | + <div class="meal_price_box"> | ||
463 | + <div><span>服务价格</span><span class="meal_price">优惠价格¥{{Math.abs(priceList.count)?Math.abs(priceList.count):0}}</span> | ||
464 | + </div> | ||
465 | + <div class="price"><span class="meal_price">¥{{priceList.o_price?priceList.o_price:0}}</span><span | ||
466 | + class="old_price">原价¥{{priceList.price?priceList.price:0}}</span></div> | ||
467 | + </div> | ||
468 | + <div class="incer">此服务由慈界平台优质服务商提供</div> | ||
469 | + <div class="sever_list"><span :class="{'span_active':index==active_index}" | ||
470 | + v-for="(item,index) in attribute" | ||
471 | + @click="t_choose_sever(item,index)">{{item}}</span></div> | ||
472 | + <div class="pay_box"> | ||
473 | + <span class="pay_num">购买数量 <span | ||
474 | + class="limit">(限购<span>{{priceList.limit_num?priceList.limit_num:0}}</span>{{unit}})</span></span> | ||
475 | + <div class="pay_btn_box"> | ||
476 | + <span class="iconfont icon-jian" @click="t_reduce"></span> | ||
477 | + <input type="number" placeholder="" value="1" v-model="num"> | ||
478 | + <span class="iconfont icon-jikediancanicon09" @click="t_plus"></span> | ||
479 | + </div> | ||
480 | + </div> | ||
481 | + <div class="pay_btn" @click="t_pay_go">确定</div> | ||
482 | + </div> | ||
483 | + </div> | ||
108 | </div> | 484 | </div> |
109 | </body> | 485 | </body> |
110 | </html> | 486 | </html> |
111 | <script type="text/javascript" src="../../assets/js/api.js"></script> | 487 | <script type="text/javascript" src="../../assets/js/api.js"></script> |
488 | +<script type="text/javascript" src="../../assets/js/weui.min.js"></script> | ||
112 | <script type="text/javascript" src="../../assets/js/public.js"></script> | 489 | <script type="text/javascript" src="../../assets/js/public.js"></script> |
113 | <script type="text/javascript" src="../../assets/js/fastclick.js"></script> | 490 | <script type="text/javascript" src="../../assets/js/fastclick.js"></script> |
114 | <script> | 491 | <script> |
@@ -130,10 +507,8 @@ | @@ -130,10 +507,8 @@ | ||
130 | hour: '', | 507 | hour: '', |
131 | minute: '', | 508 | minute: '', |
132 | date_info: '', | 509 | date_info: '', |
133 | - id: '', | ||
134 | cid: '', | 510 | cid: '', |
135 | room: '', | 511 | room: '', |
136 | - attribute: '', | ||
137 | goods: [], | 512 | goods: [], |
138 | real_price: '', | 513 | real_price: '', |
139 | attribute_type: '', | 514 | attribute_type: '', |
@@ -141,33 +516,40 @@ | @@ -141,33 +516,40 @@ | ||
141 | tel: '', | 516 | tel: '', |
142 | order_id: '', | 517 | order_id: '', |
143 | user_info: [], | 518 | user_info: [], |
519 | + pos: 'fixed', | ||
520 | + num: 1, | ||
521 | + sever_list: [], | ||
522 | + active_index: -1, | ||
523 | + active_name: '', | ||
524 | + priceList: [], | ||
525 | + attribute: [], | ||
526 | + id: '', | ||
144 | unit: '', | 527 | unit: '', |
145 | - pos: 'fixed' | 528 | + taocan: false |
146 | }, | 529 | }, |
147 | created: function () { | 530 | created: function () { |
148 | - apiready = function () { | ||
149 | - app.id = api.pageParam.id; | ||
150 | - app.cid = api.pageParam.cid; | ||
151 | - app.applyInfo(); | ||
152 | - app.getUserIndexInfo(); | ||
153 | - api.addEventListener({ | ||
154 | - name: 'meal' | ||
155 | - }, function (ret, err) { | ||
156 | - app.meal = ret.value.meal + ',' + ret.value.num + app.unit; | ||
157 | - app.total = parseFloat(ret.value.price) * (ret.value.num); | ||
158 | - app.attribute_id = ret.value.attribute_id; | ||
159 | - app.num = ret.value.num; | ||
160 | - // alert(JSON.stringify(ret.value)); | ||
161 | - }); | ||
162 | - api.addEventListener({ | ||
163 | - name: 'room' | ||
164 | - }, function (ret, err) { | ||
165 | - app.room = ret.value.name_left + ',' + ret.value.name_right + ',' + ret.value.num + app.unit; | ||
166 | - // alert(JSON.stringify(ret.value)); | ||
167 | - app.num = ret.value.num; | ||
168 | - app.attribute_id = ret.value.attribute_id; | ||
169 | - app.total = parseFloat(ret.value.price) * (ret.value.num) | ||
170 | - }); | 531 | + this.id = localStorage.getItem('id'); |
532 | + this.cid = localStorage.getItem('cid'); | ||
533 | + this.applyInfo(); | ||
534 | + this.getUserIndexInfo(); | ||
535 | + // api.addEventListener({ | ||
536 | + // name: 'meal' | ||
537 | + // }, function (ret, err) { | ||
538 | + // app.meal = ret.value.meal + ',' + ret.value.num + app.unit; | ||
539 | + // app.total = parseFloat(ret.value.price) * (ret.value.num); | ||
540 | + // app.attribute_id = ret.value.attribute_id; | ||
541 | + // app.num = ret.value.num; | ||
542 | + // // alert(JSON.stringify(ret.value)); | ||
543 | + // }); | ||
544 | + // api.addEventListener({ | ||
545 | + // name: 'room' | ||
546 | + // }, function (ret, err) { | ||
547 | + // app.room = ret.value.name_left + ',' + ret.value.name_right + ',' + ret.value.num + app.unit; | ||
548 | + // // alert(JSON.stringify(ret.value)); | ||
549 | + // app.num = ret.value.num; | ||
550 | + // app.attribute_id = ret.value.attribute_id; | ||
551 | + // app.total = parseFloat(ret.value.price) * (ret.value.num) | ||
552 | + // }); | ||
171 | var client_h = window.innerHeight; | 553 | var client_h = window.innerHeight; |
172 | window.addEventListener('resize', function () { | 554 | window.addEventListener('resize', function () { |
173 | if (window.innerHeight < client_h) { | 555 | if (window.innerHeight < client_h) { |
@@ -176,36 +558,25 @@ | @@ -176,36 +558,25 @@ | ||
176 | app.pos = 'fixed' | 558 | app.pos = 'fixed' |
177 | } | 559 | } |
178 | }, false); | 560 | }, false); |
179 | - } | ||
180 | }, | 561 | }, |
181 | methods: { | 562 | methods: { |
182 | // 选择套餐 | 563 | // 选择套餐 |
183 | set_meal: function () { | 564 | set_meal: function () { |
184 | - api.openFrame({ | ||
185 | - bgColor: 'rgba(0,0,0,0.05)', | ||
186 | - name: 'choose_meal_f', | ||
187 | - url: './choose_meal_f.html', | ||
188 | - bounces: false, | ||
189 | - animation: { | ||
190 | - type: "push", | ||
191 | - subType: "from_bottom", | ||
192 | - duration: 300 | ||
193 | - }, | ||
194 | - rect: { | ||
195 | - x: 0, | ||
196 | - y: 0, | ||
197 | - w: 'auto', | ||
198 | - h: 'auto' | ||
199 | - }, | ||
200 | - pageParam: { | ||
201 | - id: app.id, | ||
202 | - attribute: app.attribute, | ||
203 | - unit: app.unit | ||
204 | - } | ||
205 | - }); | 565 | + var app = this; |
566 | + app.taocan = true; | ||
567 | + // openWin({ | ||
568 | + // name: 'choose_meal_f', | ||
569 | + // url: './choose_meal_f.html', | ||
570 | + // pageParam: { | ||
571 | + // id: app.id, | ||
572 | + // attribute: app.attribute, | ||
573 | + // unit: app.unit | ||
574 | + // } | ||
575 | + // }) | ||
206 | }, | 576 | }, |
207 | // 选择入住等级 | 577 | // 选择入住等级 |
208 | set_rank: function () { | 578 | set_rank: function () { |
579 | + var app = this; | ||
209 | if (app.date_info) { | 580 | if (app.date_info) { |
210 | api.confirm({ | 581 | api.confirm({ |
211 | title: '选择套餐', | 582 | title: '选择套餐', |
@@ -246,6 +617,7 @@ | @@ -246,6 +617,7 @@ | ||
246 | }, | 617 | }, |
247 | // 选择日期 | 618 | // 选择日期 |
248 | dateSelect: function () { | 619 | dateSelect: function () { |
620 | + var app = this; | ||
249 | if (app.room) { | 621 | if (app.room) { |
250 | api.confirm({ | 622 | api.confirm({ |
251 | title: '选择套餐', | 623 | title: '选择套餐', |
@@ -321,6 +693,7 @@ | @@ -321,6 +693,7 @@ | ||
321 | }, | 693 | }, |
322 | // 预约时间 | 694 | // 预约时间 |
323 | openDate: function () { | 695 | openDate: function () { |
696 | + var app = this; | ||
324 | if (app.date_info == '') { | 697 | if (app.date_info == '') { |
325 | toastMsg('入住时间') | 698 | toastMsg('入住时间') |
326 | } else if (app.name == '') { | 699 | } else if (app.name == '') { |
@@ -349,6 +722,7 @@ | @@ -349,6 +722,7 @@ | ||
349 | }, | 722 | }, |
350 | // 获取订单详情 | 723 | // 获取订单详情 |
351 | applyInfo: function () { | 724 | applyInfo: function () { |
725 | + var app = this; | ||
352 | var post = { | 726 | var post = { |
353 | gid: app.id | 727 | gid: app.id |
354 | }; | 728 | }; |
@@ -373,6 +747,7 @@ | @@ -373,6 +747,7 @@ | ||
373 | }, | 747 | }, |
374 | // 下单 | 748 | // 下单 |
375 | openOrder: function () { | 749 | openOrder: function () { |
750 | + var app = this; | ||
376 | if (app.room == '' && app.meal == '') { | 751 | if (app.room == '' && app.meal == '') { |
377 | toastMsg('请选择套餐') | 752 | toastMsg('请选择套餐') |
378 | } | 753 | } |
@@ -407,6 +782,7 @@ | @@ -407,6 +782,7 @@ | ||
407 | }, | 782 | }, |
408 | // 客服 | 783 | // 客服 |
409 | openSever: function () { | 784 | openSever: function () { |
785 | + var app = this; | ||
410 | app.img_active = false; | 786 | app.img_active = false; |
411 | app.getRongYunToken(); | 787 | app.getRongYunToken(); |
412 | 788 | ||
@@ -455,6 +831,7 @@ | @@ -455,6 +831,7 @@ | ||
455 | }, | 831 | }, |
456 | // 获取客服token | 832 | // 获取客服token |
457 | getRongYunToken: function () { | 833 | getRongYunToken: function () { |
834 | + var app = this; | ||
458 | var header = { | 835 | var header = { |
459 | "XX-Device-Type": getDevice(), | 836 | "XX-Device-Type": getDevice(), |
460 | 'XX-Token': getToken() | 837 | 'XX-Token': getToken() |
@@ -471,6 +848,7 @@ | @@ -471,6 +848,7 @@ | ||
471 | }, | 848 | }, |
472 | // 获取个人信息 | 849 | // 获取个人信息 |
473 | getUserIndexInfo: function () { | 850 | getUserIndexInfo: function () { |
851 | + var app = this; | ||
474 | var header = { | 852 | var header = { |
475 | "XX-Device-Type": getDevice(), | 853 | "XX-Device-Type": getDevice(), |
476 | 'XX-Token': getToken() | 854 | 'XX-Token': getToken() |
@@ -484,9 +862,135 @@ | @@ -484,9 +862,135 @@ | ||
484 | }) | 862 | }) |
485 | }, | 863 | }, |
486 | input_focus: function () { | 864 | input_focus: function () { |
865 | + var app = this; | ||
487 | setTimeout(function () { | 866 | setTimeout(function () { |
488 | document.body.scrollTop = document.body.scrollHeight; | 867 | document.body.scrollTop = document.body.scrollHeight; |
489 | }, 300); | 868 | }, 300); |
869 | + }, | ||
870 | + //套餐选择2 | ||
871 | + close: function () { | ||
872 | + // api.closeWin({ | ||
873 | + // name: 'choose_meal_w' | ||
874 | + // }); | ||
875 | + this.taocan = false | ||
876 | + this.room = false | ||
877 | + }, | ||
878 | + t_choose_sever: function (attr, index) { | ||
879 | + var app = this; | ||
880 | + app.active_index = index; | ||
881 | + app.active_name = app.attribute[index]; | ||
882 | + app.attribute_id = app.attribute[index].id; | ||
883 | + var post = { | ||
884 | + id: app.id, | ||
885 | + attribute: attr | ||
886 | + }; | ||
887 | + var header = { | ||
888 | + "XX-Device-Type": getDevice(), | ||
889 | + 'XX-Token': getToken() | ||
890 | + }; | ||
891 | + getRequest('post', 'portal/Goods/getPrice', post, header).then(function (res) { | ||
892 | + // alert(JSON.stringify(res)) | ||
893 | + if (res.data.code == 1) { | ||
894 | + app.priceList = res.data.data; | ||
895 | + } else { | ||
896 | + toastMsg(res.msg) | ||
897 | + } | ||
898 | + }); | ||
899 | + app.num = 1; | ||
900 | + app.meal = app.active_name + app.num + app.unit; | ||
901 | + app.total = parseFloat(app.priceList.price) * (app.num); | ||
902 | + }, | ||
903 | + t_reduce: function () { | ||
904 | + var app = this; | ||
905 | + if (app.num > 1) { | ||
906 | + app.num-- | ||
907 | + } | ||
908 | + app.total = parseFloat(app.priceList.price) * (app.num); | ||
909 | + app.meal = app.active_name + app.num + app.unit; | ||
910 | + }, | ||
911 | + t_plus: function () { | ||
912 | + var app = this; | ||
913 | + if (app.num < app.priceList.limit_num) { | ||
914 | + app.num++ | ||
915 | + } else { | ||
916 | + toastMsg('不能超过最大限购哦') | ||
917 | + } | ||
918 | + app.total = parseFloat(app.priceList.price) * (app.num); | ||
919 | + app.meal = app.active_name + app.num + app.unit; | ||
920 | + }, | ||
921 | + t_pay_go: function () { | ||
922 | + var app = this; | ||
923 | + if (app.active_name != '') { | ||
924 | + app.close() | ||
925 | + } else { | ||
926 | + toastMsg('请选择套餐类型') | ||
927 | + } | ||
928 | + | ||
929 | + }, | ||
930 | + choose_left: function (index) { | ||
931 | + app.active_index = index; | ||
932 | + app.active_left = app.attribute[0][index]; | ||
933 | + app.num = app.price_info.limit_num; | ||
934 | + app.getPrice(); | ||
935 | + }, | ||
936 | + choose_right: function (index) { | ||
937 | + app.active_index2 = index; | ||
938 | + app.active_right = app.attribute[1][index]; | ||
939 | + app.getPrice(); | ||
940 | + app.num = app.price_info.limit_num; | ||
941 | + }, | ||
942 | + reduce: function () { | ||
943 | + if (app.price_info.limit_num) { | ||
944 | + if (app.num > app.price_info.limit_num) { | ||
945 | + app.num-- | ||
946 | + } else { | ||
947 | + toastMsg('不能低于' + app.price_info.limit_num + '个月哦') | ||
948 | + } | ||
949 | + }else { | ||
950 | + toastMsg('请选择入住类型') | ||
951 | + } | ||
952 | + }, | ||
953 | + plus: function () { | ||
954 | + if (app.num < app.price_info.limit_num) { | ||
955 | + } else { | ||
956 | + app.num++ | ||
957 | + } | ||
958 | + }, | ||
959 | + getPrice: function () { | ||
960 | + if (app.active_left && app.active_right) { | ||
961 | + var post = { | ||
962 | + attribute: app.active_left + '_' + app.active_right, | ||
963 | + id: app.id | ||
964 | + }; | ||
965 | + getRequest('post', 'portal/Goods/getPrice', post, null).then(function (res) { | ||
966 | + if (res.data.code == 1) { | ||
967 | + app.price_info = res.data.data; | ||
968 | + app.num = app.price_info.limit_num; | ||
969 | + app.attribute_id = app.price_info.attribute_id | ||
970 | + } | ||
971 | + }) | ||
972 | + } else { | ||
973 | + toastMsg('请选择入住类型') | ||
974 | + } | ||
975 | + | ||
976 | + }, | ||
977 | + pay_go: function () { | ||
978 | + if (app.active_left && app.active_right) { | ||
979 | + api.sendEvent({ | ||
980 | + name: 'room', | ||
981 | + extra: { | ||
982 | + name_left: app.active_left, | ||
983 | + name_right: app.active_right, | ||
984 | + num: app.num, | ||
985 | + price: app.price_info.price, | ||
986 | + attribute_id: app.attribute_id | ||
987 | + } | ||
988 | + }); | ||
989 | + app.close() | ||
990 | + } | ||
991 | + else { | ||
992 | + toastMsg('请选择入住类型') | ||
993 | + } | ||
490 | } | 994 | } |
491 | } | 995 | } |
492 | }) | 996 | }) |
@@ -40,7 +40,9 @@ | @@ -40,7 +40,9 @@ | ||
40 | padding: 0.16rem 0; | 40 | padding: 0.16rem 0; |
41 | color: #424242; | 41 | color: #424242; |
42 | } | 42 | } |
43 | - | 43 | + .warp{ |
44 | + overflow-y: scroll; | ||
45 | + } | ||
44 | .examination_active { | 46 | .examination_active { |
45 | color: #D8B25F; | 47 | color: #D8B25F; |
46 | border-bottom: 0.04rem solid #D8B25F; | 48 | border-bottom: 0.04rem solid #D8B25F; |
@@ -57,7 +59,9 @@ | @@ -57,7 +59,9 @@ | ||
57 | flex-flow: column; | 59 | flex-flow: column; |
58 | -webkit-flex-flow: column; | 60 | -webkit-flex-flow: column; |
59 | -webkit-box-orient: vertical; | 61 | -webkit-box-orient: vertical; |
60 | - overflow-x: hidden; | 62 | + -webkit-margin-start: auto; |
63 | + width: 100%; | ||
64 | + box-sizing: border-box; | ||
61 | } | 65 | } |
62 | 66 | ||
63 | .old_price { | 67 | .old_price { |
@@ -78,7 +82,12 @@ | @@ -78,7 +82,12 @@ | ||
78 | -webkit-flex-flow: column; | 82 | -webkit-flex-flow: column; |
79 | overflow-x: hidden; | 83 | overflow-x: hidden; |
80 | } | 84 | } |
81 | - | 85 | + .swiper-container{ |
86 | + height: 100%; | ||
87 | + } | ||
88 | + .swiper-wrapper{ | ||
89 | + height: 100%; | ||
90 | + } | ||
82 | 91 | ||
83 | 92 | ||
84 | </style> | 93 | </style> |
@@ -87,22 +96,18 @@ | @@ -87,22 +96,18 @@ | ||
87 | <!-- 背景充满 --> | 96 | <!-- 背景充满 --> |
88 | <div id="loadStart"></div> | 97 | <div id="loadStart"></div> |
89 | <div id="app"> | 98 | <div id="app"> |
90 | - <header id="header"> | ||
91 | - <div class="index_header white_bg"> | ||
92 | - <div class="close_left" onclick="closeWindow()"> | ||
93 | - <span class="iconfont icon-fanhui"></span> | ||
94 | - </div> | ||
95 | - <div class="win_mid">{{winTitle}}</div> | ||
96 | - <div></div> | ||
97 | - </div> | ||
98 | - </header> | 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>--> | ||
99 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> | 108 | <div class="nurse_banner" :style="{backgroundImage:'url(' + banner + ')'}"> |
100 | <div class="nurse_text">{{name}}</div> | 109 | <div class="nurse_text">{{name}}</div> |
101 | </div> | 110 | </div> |
102 | - <div class="warp"> | ||
103 | - <!-- {{JSON.stringify(banner)}} --> | ||
104 | - | ||
105 | - <div class="examination_box"> | ||
106 | <div class="examination_swiper"> | 111 | <div class="examination_swiper"> |
107 | <div class="swiper-container"> | 112 | <div class="swiper-container"> |
108 | <div class="swiper-wrapper"> | 113 | <div class="swiper-wrapper"> |
@@ -112,7 +117,12 @@ | @@ -112,7 +117,12 @@ | ||
112 | </div> | 117 | </div> |
113 | </div> | 118 | </div> |
114 | </div> | 119 | </div> |
115 | - <div class="examination_content_swiper warp"> | 120 | + <div class="warp"> |
121 | + <!-- {{JSON.stringify(banner)}} --> | ||
122 | + | ||
123 | + <div class="examination_box"> | ||
124 | + | ||
125 | + <div class="examination_content_swiper "> | ||
116 | <div class="swiper-container"> | 126 | <div class="swiper-container"> |
117 | <div class="swiper-wrapper"> | 127 | <div class="swiper-wrapper"> |
118 | <div class="swiper-slide" v-for="(item,index) in goods"> | 128 | <div class="swiper-slide" v-for="(item,index) in goods"> |
@@ -181,8 +191,9 @@ | @@ -181,8 +191,9 @@ | ||
181 | }, | 191 | }, |
182 | created: function () { | 192 | created: function () { |
183 | var app = this; | 193 | var app = this; |
184 | - this.cid = localStorage.getItem('cid') | ||
185 | - this.winTitle = localStorage.getItem('winTitle') | 194 | + this.cid = localStorage.getItem('cid'); |
195 | + this.winTitle = localStorage.getItem('winTitle'); | ||
196 | + document.getElementsByTagName("title")[0].innerText = this.winTitle; | ||
186 | this.getCatInfo3(); | 197 | this.getCatInfo3(); |
187 | 198 | ||
188 | 199 | ||
@@ -195,14 +206,14 @@ | @@ -195,14 +206,14 @@ | ||
195 | }, | 206 | }, |
196 | openDoc: function (id) { | 207 | openDoc: function (id) { |
197 | var app = this; | 208 | var app = this; |
198 | - // api.openWin({ | ||
199 | - // name: 'care_w', | ||
200 | - // url: './care_w.html', | ||
201 | - // pageParam: { | ||
202 | - // id: id, | ||
203 | - // cid: app.cid | ||
204 | - // } | ||
205 | - // }) | 209 | + openWin({ |
210 | + name: 'care_w', | ||
211 | + url: './care_f.html', | ||
212 | + pageParam: { | ||
213 | + id: id, | ||
214 | + cid: app.cid | ||
215 | + } | ||
216 | + }) | ||
206 | }, | 217 | }, |
207 | getCatInfo3: function () { | 218 | getCatInfo3: function () { |
208 | var app = this; | 219 | var app = this; |
@@ -84,6 +84,8 @@ | @@ -84,6 +84,8 @@ | ||
84 | </head> | 84 | </head> |
85 | 85 | ||
86 | <body> | 86 | <body> |
87 | + <!-- 背景充满 --> | ||
88 | + <div id="loadStart"></div> | ||
87 | <div id="app" v-cloak> | 89 | <div id="app" v-cloak> |
88 | <div id="container"></div> | 90 | <div id="container"></div> |
89 | <header :class="index===0?'headers':''"> | 91 | <header :class="index===0?'headers':''"> |
@@ -234,8 +236,6 @@ | @@ -234,8 +236,6 @@ | ||
234 | getlng: '', | 236 | getlng: '', |
235 | getlat: '', | 237 | getlat: '', |
236 | cityindex: '', | 238 | cityindex: '', |
237 | - cityname: '', | ||
238 | - img_active: false, | ||
239 | map: {}, | 239 | map: {}, |
240 | newList: [], | 240 | newList: [], |
241 | img_active: false, | 241 | img_active: false, |
@@ -262,6 +262,7 @@ | @@ -262,6 +262,7 @@ | ||
262 | this.indexList(); //第三栏 | 262 | this.indexList(); //第三栏 |
263 | this.show(); //严选推荐 | 263 | this.show(); //严选推荐 |
264 | // 底部轮播图 | 264 | // 底部轮播图 |
265 | + loadEnd() | ||
265 | }, | 266 | }, |
266 | mounted: function () { | 267 | mounted: function () { |
267 | window.addEventListener('scroll', this.handleScroll) | 268 | window.addEventListener('scroll', this.handleScroll) |
@@ -410,17 +411,12 @@ | @@ -410,17 +411,12 @@ | ||
410 | }, | 411 | }, |
411 | // 打开投资 | 412 | // 打开投资 |
412 | openStrict: function () { | 413 | openStrict: function () { |
413 | - app.img_active = false; | ||
414 | - | ||
415 | - api.setFrameGroupIndex({ | ||
416 | - name: 'index_fm', | ||
417 | - index: 1 | ||
418 | - }) | 414 | + window.location.href = '../strict/strict_f.html' |
419 | }, | 415 | }, |
420 | // 打开订单 | 416 | // 打开订单 |
421 | openOrder: function () { | 417 | openOrder: function () { |
422 | app.img_active = false; | 418 | app.img_active = false; |
423 | - openView('my_orderlist', 'my/my_orderlist', '我的订单', 'my_orderlist', false, false, false); | 419 | + openView('my_orderlist', '../my/my_orderlist', '我的订单', 'my_orderlist', false, false, false); |
424 | api.sendEvent({ | 420 | api.sendEvent({ |
425 | name: 'hide_menu', | 421 | name: 'hide_menu', |
426 | extra: { | 422 | extra: { |
@@ -431,19 +427,13 @@ | @@ -431,19 +427,13 @@ | ||
431 | // 打开健康档案 | 427 | // 打开健康档案 |
432 | openHealth: function () { | 428 | openHealth: function () { |
433 | app.img_active = false; | 429 | app.img_active = false; |
434 | - api.openWin({ | 430 | + openWin({ |
435 | name: 'my_health_w', | 431 | name: 'my_health_w', |
436 | - url: '../my/my_health_w.html', | 432 | + url: '../my/my_health.html', |
437 | pageParam: { | 433 | pageParam: { |
438 | rid: 0 | 434 | rid: 0 |
439 | } | 435 | } |
440 | }); | 436 | }); |
441 | - api.sendEvent({ | ||
442 | - name: 'hide_menu', | ||
443 | - extra: { | ||
444 | - img_active: false | ||
445 | - } | ||
446 | - }); | ||
447 | }, | 437 | }, |
448 | // 打开客服 | 438 | // 打开客服 |
449 | openSever: function () { | 439 | openSever: function () { |
@@ -1098,7 +1098,6 @@ | @@ -1098,7 +1098,6 @@ | ||
1098 | user_address_detail: '',//详细地址 | 1098 | user_address_detail: '',//详细地址 |
1099 | user_id_card: '',//身份证号 | 1099 | user_id_card: '',//身份证号 |
1100 | user_content: '',//详细描述 | 1100 | user_content: '',//详细描述 |
1101 | - popupVisible: false,//相机显示 | ||
1102 | img: '',//上传证明 | 1101 | img: '',//上传证明 |
1103 | imgs: [], | 1102 | imgs: [], |
1104 | meal: '',//套餐 | 1103 | meal: '',//套餐 |
@@ -1131,7 +1130,6 @@ | @@ -1131,7 +1130,6 @@ | ||
1131 | user_address_list: [], | 1130 | user_address_list: [], |
1132 | address_show: true, | 1131 | address_show: true, |
1133 | lon: '', | 1132 | lon: '', |
1134 | - lat: '', | ||
1135 | latitude: '', | 1133 | latitude: '', |
1136 | longitude: '', | 1134 | longitude: '', |
1137 | //经度 | 1135 | //经度 |
@@ -1173,7 +1171,6 @@ | @@ -1173,7 +1171,6 @@ | ||
1173 | this.applyInfo(); | 1171 | this.applyInfo(); |
1174 | //获取当前地址 | 1172 | //获取当前地址 |
1175 | this.get_city(); | 1173 | this.get_city(); |
1176 | - this.getsdk(); | ||
1177 | //获取已经上传的图片 | 1174 | //获取已经上传的图片 |
1178 | if ($api.getStorage('img1') || ($api.getStorage('img2')) || ($api.getStorage('img3')) || ($api.getStorage('img4'))) { | 1175 | if ($api.getStorage('img1') || ($api.getStorage('img2')) || ($api.getStorage('img3')) || ($api.getStorage('img4'))) { |
1179 | app.img1 = $api.getStorage('img1'); | 1176 | app.img1 = $api.getStorage('img1'); |
@@ -1716,29 +1713,25 @@ | @@ -1716,29 +1713,25 @@ | ||
1716 | }, | 1713 | }, |
1717 | //证明上传 | 1714 | //证明上传 |
1718 | addPic(event){ | 1715 | addPic(event){ |
1719 | - | ||
1720 | - }, | ||
1721 | - //诊断证明/医疗处置单 | ||
1722 | - auth1: function (type) { | ||
1723 | - wx.chooseImage({ | ||
1724 | - count: 1, // 默认9 | ||
1725 | - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有 | ||
1726 | - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有 | ||
1727 | - success: function (res) { | ||
1728 | - var localIds = res.localIds; // 返回选定照片的本地ID列表,localId可以作为img标签的src属性显示图片 | ||
1729 | - wx.uploadImage({ | ||
1730 | - localId: localIds, // 需要上传的图片的本地ID,由chooseImage接口获得 | ||
1731 | - isShowProgressTips: 1, // 默认为1,显示进度提示 | ||
1732 | - success: function (res) { | ||
1733 | - var serverId = res.serverId; // 返回图片的服务器端ID | ||
1734 | - app.img1=serverId | ||
1735 | - } | ||
1736 | - | ||
1737 | - }); | 1716 | + var file = event.target.files[0]; |
1717 | + console.log(file) | ||
1718 | + var formData = new FormData(); | ||
1719 | + formData.append('file', file); | ||
1720 | + var header = { | ||
1721 | + "XX-Device-Type": getDevice(), | ||
1722 | + 'XX-Token': getToken() | ||
1723 | + }; | ||
1724 | + getRequest('post', 'portal/Goods/uploadProve', formData, header).then(function (res) { | ||
1725 | + alert(JSON.stringify(res)) | ||
1726 | + if (res.data.code == 1) { | ||
1727 | + app.priceList = res.data.data; | ||
1728 | + } else { | ||
1729 | + toastMsg(res.msg) | ||
1738 | } | 1730 | } |
1739 | - | ||
1740 | }); | 1731 | }); |
1741 | }, | 1732 | }, |
1733 | + //诊断证明/医疗处置单 | ||
1734 | + | ||
1742 | // 药品处方 | 1735 | // 药品处方 |
1743 | auth2: function (type) { | 1736 | auth2: function (type) { |
1744 | app.popupVisible1 = false; | 1737 | app.popupVisible1 = false; |
-
请 注册 或 登录 后发表评论