diff --git a/pages/my/my.wxml b/pages/my/my.wxml
index 979a229..84347cb 100644
--- a/pages/my/my.wxml
+++ b/pages/my/my.wxml
@@ -2,13 +2,11 @@
title="个人中心"
left-text=""
right-text=""
- left-arrow
bind:click-left="onClickLeft"
bind:click-right="onClickRight"
style=" position: fixed;left: 0;top: 0;width: 100%;z-index: 2;"
/>
-
@@ -42,7 +40,7 @@
-->
-
+
diff --git a/pages/orderdetail/orderdetail.wxml b/pages/orderdetail/orderdetail.wxml
index 89a9328..7efb5db 100644
--- a/pages/orderdetail/orderdetail.wxml
+++ b/pages/orderdetail/orderdetail.wxml
@@ -69,9 +69,9 @@
- {{item.usercName}}
+ {{item.userbName}}
- 地址：{{item.hospitalAddress}}
+ 地址：{{item.hospitalAddress+item.hospitalName}}
diff --git a/pages/peizhen/peizhendetail.js b/pages/peizhen/peizhendetail.js
index 38e954b..c264ef5 100644
--- a/pages/peizhen/peizhendetail.js
+++ b/pages/peizhen/peizhendetail.js
@@ -6,26 +6,31 @@ Page({
* 页面的初始数据
*/
data: {
+ task: {
+ phone: '',
+ phonedisplay: false,
+ placeholder: '请输入联系方式'
+ },
//普通选择器：（普通数组）
// array: ['请选择医院', '西京医院', '省人民医院', '红会医院'],
objectArray: [{
- text: '请选择医院',
- value: 10
- },
- {
- text: '第四军医大学西京医院',
- value: 2
- },
- {
- text: '陕西省人民医院',
- value: 3
- },
- {
- text: '西安市高新医院',
- value: 1
- },
- ],
- objectIndex: 0, //默认显示位置
+ text: '请选择医院',
+ value: 10
+ },
+ {
+ text: '第四军医大学西京医院',
+ value: 2
+ },
+ {
+ text: '陕西省人民医院',
+ value: 3
+ },
+ {
+ text: '西安市高新医院',
+ value: 1
+ },
+ ],
+ objectIndex: 0, //默认显示位置
show: true,
height: '',
seckill_start: '请输入开始日期',
@@ -52,16 +57,52 @@ Page({
clock: '',
address: '',
danjia: 0.01, //单位为元
- beizhu: ''
+ beizhu: '',
+ name: '',
+ jzphone: ''
+
+ },
+ inputtaskphone(e) {
+ if (e.detail.value != '') {
+ if (!(/^1[3456789]\d{9}$/.test(e.detail.value))) {
+ this.setData({
+ phonedisplay: true,
+ placeholder: '',
+ 'task.phone': ''
+ })
+ }
+ }
+ },
+ focus() {
+ this.setData({
+ phonedisplay: false,
+ placeholder: '请输入联系方式',
+ 'task.phone': ''
+ })
},
+ bindNameInput: function (e) {
+ this.setData({
+ name: e.detail.value
+ })
+ },
+ bindPhoneInput: function (e) {
+ this.setData({
+ jzphone: e.detail.value
+ })
+ },
+ bindAdressInput: function (e) {
+ this.setData({
+ address: e.detail.value
+ })
+ },
// 确认支付
confirm_payy: async function () {
- wx.showToast({
- title: '点击了',
- icon: 'none'
- });
+ // wx.showToast({
+ // title: '点击了',
+ // icon: 'none'
+ // });
var that = this;
if (!this.data.is_ok_click) {
that.setData({
@@ -124,6 +165,14 @@ Page({
console.log(event.detail);
},
payment() {
+
+ if (this.data.objectIndex == 0) {
+ wx.showToast({
+ title: '请输选择医院',
+ icon: 'none'
+ });
+ return
+ }
if (this.data.seckill_start == "请输入开始日期") {
wx.showToast({
title: '请输入开始日期',
@@ -134,18 +183,18 @@ Page({
var that = this;
wx.request({
- url: app.globalData.url + '/system/order/insertOrderPzz',
+ url: app.globalData.url + '/system/order/insertOrderPz',
data: {
bId: "1", //陪护人员id
cId: wx.getStorageSync('uid'), //患者id
- yuguMoney: "1", //金额
+ yuguMoney: this.data.item.price, //金额
yuliu9: "2", //订单大类1-陪护 2-陪诊
yuliu10: this.data.item.ordertype, //订单类型1-全程陪诊，2-诊前约号3-送取报告4-待办问诊
hospitalId: this.data.objectArray[this.data.objectIndex].value,
startTime: this.data.seckill_start,
- yuliu11: "18691577328", //患者电话
- yuliu12: "无", //特殊要求
- yuliu13: "东泰城市之光", //送达地址
+ yuliu11: this.data.jzphone, //患者电话
+ yuliu12: this.data.beizhu, //特殊要求
+ yuliu13: this.data.address, //送达地址
yuliu14: "610526198701180018" //患者身份证号
},
method: 'POST',
@@ -163,30 +212,6 @@ Page({
wx.navigateTo({
url: '/shopping/pages/paysuccess/paysuccess?' + "order_id=" + that.data.order_id,
});
-
-
- // console.log('timeStamp==' + res.data.data.timeStamp)
- // console.log('nonceStr==' + res.data.data.nonceStr)
- // console.log('package==' + res.data.data.package)
- // console.log('signType==' + res.data.data.signType)
- // console.log('paySign==' + res.data.data.paySign)
- // wx.requestPayment({
- // timeStamp: res.data.data.timeStamp,
- // nonceStr: res.data.data.nonceStr,
- // package: res.data.data.package,
- // signType: res.data.data.signType,
- // paySign: res.data.data.paySign,
- // success(res) {
- // console.log('支付成功');
- // app.console(that.data.order_id + "======要传的order_id")
- // wx.navigateTo({
- // url: '/shopping/pages/paysuccess/paysuccess?' + "order_id=" + that.data.order_id,
- // });
- // },
- // fail(res) {
- // console.log('支付失败');
- // }
- // })
} else {
wx.showToast({
title: res.data.msg,
@@ -323,25 +348,4 @@ Page({
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 41fb9db..6181143 100644
--- a/pages/peizhen/peizhendetail.wxml
+++ b/pages/peizhen/peizhendetail.wxml
@@ -29,13 +29,13 @@
- {{"陪护时间选择"}}
+ {{"完善信息"}}
-
- 就诊医院
+ *
+ 就诊医院
@@ -48,29 +48,27 @@
-
+
*
就诊人电话
-
+
-
-
-
+
- 报告收件地址
+ 报告收件地址
-
+
@@ -81,7 +79,7 @@
- 服务时间
+ 服务时间
@@ -99,7 +97,7 @@
-
+