diff --git a/pages/image/Shaping.png b/pages/image/Shaping.png deleted file mode 100644 index b502736..0000000 Binary files a/pages/image/Shaping.png and /dev/null differ diff --git a/pages/image/abc.png b/pages/image/abc.png index 40cfe13..7bb66f4 100644 Binary files a/pages/image/abc.png and b/pages/image/abc.png differ diff --git a/pages/image/antifading.png b/pages/image/antifading.png deleted file mode 100644 index c79d20d..0000000 Binary files a/pages/image/antifading.png and /dev/null differ diff --git a/pages/image/cosmetology.png b/pages/image/cosmetology.png deleted file mode 100644 index 2705b1d..0000000 Binary files a/pages/image/cosmetology.png and /dev/null differ diff --git a/pages/image/image_left.png b/pages/image/image_left.png deleted file mode 100644 index ab15151..0000000 Binary files a/pages/image/image_left.png and /dev/null differ diff --git a/pages/image/image_right.png b/pages/image/image_right.png deleted file mode 100644 index b404c80..0000000 Binary files a/pages/image/image_right.png and /dev/null differ diff --git a/pages/image/pintuan.png b/pages/image/pintuan.png deleted file mode 100644 index 9064418..0000000 Binary files a/pages/image/pintuan.png and /dev/null differ diff --git a/pages/image/tuiguang_bg.jpg b/pages/image/tuiguang_bg.jpg deleted file mode 100644 index d71a5e7..0000000 Binary files a/pages/image/tuiguang_bg.jpg and /dev/null differ diff --git a/pages/image/tuiguang_bj.png b/pages/image/tuiguang_bj.png deleted file mode 100644 index 08b68fb..0000000 Binary files a/pages/image/tuiguang_bj.png and /dev/null differ diff --git a/pages/index/index.js b/pages/index/index.js index c2d0fa4..3cfb9ce 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -108,6 +108,12 @@ Page({ }) }, + go_peihu(){ + wx.navigateTo({ + url: '/pages/peihu/peihu', + }) + }, + /** * 医院列表 */ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 6a73e25..f54ebf2 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -36,7 +36,7 @@ 全程无忧 - + diff --git a/pages/peizhen/peizhen.wxml b/pages/peizhen/peizhen.wxml index f7935ff..535060b 100644 --- a/pages/peizhen/peizhen.wxml +++ b/pages/peizhen/peizhen.wxml @@ -49,3 +49,11 @@ + + + + + + + + diff --git a/pages/peizhen/peizhendetail.js b/pages/peizhen/peizhendetail.js index 6065ee3..d54cdeb 100644 --- a/pages/peizhen/peizhendetail.js +++ b/pages/peizhen/peizhendetail.js @@ -6,20 +6,27 @@ Page({ * 页面的初始数据 */ data: { + //普通选择器:(普通数组) + // array: ['请选择医院', '西京医院', '省人民医院', '红会医院'], + objectArray: [{ + text: '请选择医院', + value: 10 + }, + { + text: '西京医院', + value: 11 + }, + { + text: '陕西省人民医院', + value: 12 + }, + { + text: '红会医院', + value: 13 + }, + ], + objectIndex: 0, //默认显示位置 show: true, - actions: [ - { - name: '选项', - }, - { - name: '选项', - }, - { - name: '选项', - subname: '描述信息', - openType: 'share', - }, - ], height: '', seckill_start: '请输入开始日期', time: 30 * 60 * 60 * 1000, @@ -44,7 +51,7 @@ Page({ is_ok_click: false, clock: '', address: '', - danjia: 0.01,//单位为元 + danjia: 0.01, //单位为元 beizhu: '' }, @@ -108,7 +115,9 @@ Page({ }); }, onClose() { - this.setData({ show: false }); + this.setData({ + show: false + }); }, onSelect(event) { @@ -122,22 +131,22 @@ Page({ }); return } - + var that = this; wx.request({ url: app.globalData.url + '/system/order/insertOrderPz', data: { - bId: "",//陪护人员id - cId: wx.getStorageSync('uid'),//患者id - yuguMoney: "1",//金额 - yuliu9: "2",//订单大类1-陪护 2-陪诊 - yuliu10: "1",//订单类型1-全程陪诊,2-诊前约号3-送取报告4-待办问诊 + bId: "", //陪护人员id + cId: wx.getStorageSync('uid'), //患者id + yuguMoney: "1", //金额 + yuliu9: "2", //订单大类1-陪护 2-陪诊 + yuliu10: "1", //订单类型1-全程陪诊,2-诊前约号3-送取报告4-待办问诊 hospitalId: this.data.item.hospitalId, startTime: this.data.seckill_start, - yuliu11:"18691577328",//患者电话 - yuliu12:"无",//特殊要求 - yuliu13:"东泰城市之光",//送达地址 - yuliu14:"610526198701180018"//患者身份证号 + yuliu11: "18691577328", //患者电话 + yuliu12: "无", //特殊要求 + yuliu13: "东泰城市之光", //送达地址 + yuliu14: "610526198701180018" //患者身份证号 }, method: 'POST', header: { @@ -237,7 +246,7 @@ Page({ item: item }); console.log("进入订单详情的title==" + that.data.item.title) - + }, /** @@ -303,5 +312,34 @@ Page({ login: function (e) { }, + //普通选择器2: + bindPickerChange2: function (e) { + console.log('picker发送选择改变,携带值为', e.detail.value) + this.setData({ + objectIndex: e.detail.value + }) + console.log('picker发送选择改变,医院的id值为', this.data.objectArray[this.data.objectIndex].value) + }, + +}) + + + + + + + + + + + + + + + + + + + + -}) \ No newline at end of file diff --git a/pages/peizhen/peizhendetail.wxml b/pages/peizhen/peizhendetail.wxml index 9ff6d11..ac8a09d 100644 --- a/pages/peizhen/peizhendetail.wxml +++ b/pages/peizhen/peizhendetail.wxml @@ -32,17 +32,22 @@ {{"陪护时间选择"}} - - - - + - * - 就诊医院 + + 就诊医院 - + + + + {{objectArray[objectIndex].text}} > + + + + + * 就诊人姓名 @@ -51,7 +56,8 @@ - 就诊人电话 + * + 就诊人电话 @@ -100,7 +106,7 @@ 总计金额: - {{paymoney}} + {{item.price}} 购买服务 @@ -109,3 +115,16 @@ + + + + + + + + + + + + + diff --git a/pages/peizhen/peizhendetail.wxss b/pages/peizhen/peizhendetail.wxss index e8c1b9e..f36ad6d 100644 --- a/pages/peizhen/peizhendetail.wxss +++ b/pages/peizhen/peizhendetail.wxss @@ -401,4 +401,15 @@ image { height: 100%; font-size: 28rpx; padding-right: 30rpx; - } \ No newline at end of file + } + + + /*选择器 */ +.section__title{ + margin-bottom: 20rpx; +} +.section{ + margin: 50rpx 0; + font-size: 30rpx; +} + \ No newline at end of file