From 2491faae4ac3a4f3608c4ad75a0aaf8efd90d5ad Mon Sep 17 00:00:00 2001
From: renjianbo <263303411@qq.com>
Date: Wed, 29 Mar 2023 00:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/order.js | 29 +-
pages/order/order.wxml | 15 +-
pages/orderdetail/orderdetail.js | 77 ++-
pages/orderdetail/orderdetail.wxml | 38 +-
pages/paysuccess/paysuccess.js | 66 ---
pages/paysuccess/paysuccess.json | 3 -
pages/paysuccess/paysuccess.wxml | 2 -
pages/paysuccess/paysuccess.wxss | 1 -
shopping/pages/goddess/goddess.js | 616 +++++++++-------------
shopping/pages/goddess/goddess.wxml | 162 +++---
shopping/pages/paysuccess/paysuccess.js | 4 +-
shopping/pages/paysuccess/paysuccess.wxml | 6 +-
shopping/pages/paysuccess/paysuccess.wxss | 10 +
13 files changed, 426 insertions(+), 603 deletions(-)
delete mode 100644 pages/paysuccess/paysuccess.js
delete mode 100644 pages/paysuccess/paysuccess.json
delete mode 100644 pages/paysuccess/paysuccess.wxml
delete mode 100644 pages/paysuccess/paysuccess.wxss
diff --git a/pages/order/order.js b/pages/order/order.js
index 628007c..c408de2 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -39,29 +39,18 @@ Page({
height: 46 + statusBarHeight,
});
},
- //条目点击---订单状态:-2:已取消 -1:拒绝接单 0:待付款 1:已付款 2:已接单(待服务)3:服务中 4:已完成 5申请退款 6退款中 7已退款 8:已结算
+ //条目点击---订单状态:-2:已取消 -1:拒绝接单 0:待接单 1:已接单(待支付) 2:已支付(待服务)3:服务中 4:已完成 5申请退款 6退款中 7已退款 8:已结算
+
itemclick(e) {
console.log("index==" + e.currentTarget.dataset.index)
console.log("status==" + e.currentTarget.dataset.status)
- //去待付款详情
- if (e.currentTarget.dataset.status == 0) {
- if (e.currentTarget.dataset.item != 0) {
- let item = JSON.stringify(e.currentTarget.dataset.item);
- console.log("传递的item" + item);
- wx.navigateTo({
- url: "/pages/orderdetail/orderdetail?item=" + item,
- });
- }
- }
- //去取消订单详情
- if (e.currentTarget.dataset.status == -2) {
- if (e.currentTarget.dataset.item != 0) {
- let item = JSON.stringify(e.currentTarget.dataset.item);
- console.log("传递的item" + item);
- wx.navigateTo({
- url: "/pages/orderdetail/orderdetail?item=" + item,
- });
- }
+ //去订单详情页
+ if (e.currentTarget.dataset.item != 0) {
+ let item = JSON.stringify(e.currentTarget.dataset.item);
+ console.log("传递的item" + item);
+ wx.navigateTo({
+ url: "/pages/orderdetail/orderdetail?item=" + item,
+ });
}
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index d81099d..5942d66 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -18,12 +18,12 @@
订单号:{{item.orderNumber}}
-
{{"已取消"}}
{{"拒绝接单"}}
- {{"待付款"}}
- {{"已付款"}}
+ {{"待接单"}}
+ {{"已接单"}}
{{"待服务"}}
{{"服务中"}}
{{"已完成"}}
@@ -36,20 +36,17 @@
-
+
{{item.userbName}}
{{item.serviceTime}}天
实付款:¥{{item.yuguMoney}}元
- 去付款
-
- 查看二维码
+ 去付款
+
-
-
\ No newline at end of file
diff --git a/pages/orderdetail/orderdetail.js b/pages/orderdetail/orderdetail.js
index c0853c5..6d4d6be 100644
--- a/pages/orderdetail/orderdetail.js
+++ b/pages/orderdetail/orderdetail.js
@@ -114,40 +114,28 @@ Page({
statusBarHeight: statusBarHeight,
height: 46 + statusBarHeight,
});
- app.console(this.data.height + "=================xxxxxxxxxxxxxxxxxxxxxxxx")
- console.log(e.type)
- console.log(e.id)
+
+ // console.log(e.type)
+ // console.log(e.id)
//条目点击进入详情页
this.setData({
- // btn1: 2,
order_id: e.id
})
-
+ //条目点击进入详情页,调取接口获取详情页数据,除外都是通过列表传参的方式展示详情页数据。
+ if(e.type=3){
+ this.getOrderDetail();
+ }
+ app.console(this.data.order_id+"======详情也收到的order_id")
var that = this;
let item = JSON.parse(e.item);
that.setData({
item: item,
- charge_phone: 18133233292
+ charge_phone: 18133233292,
+ order_id: item.orderId
});
- // if(options.type==1){
- // this.setData({
- // btn1:1,
- // order_id:options.id
- // })
- // }
- // if(options.type==2){
- // this.setData({
- // btn1:2,
- // order_id:options.id
- // })
- // }else if(options.type==3){
- // this.setData({
- // btn1:3,
- // order_id:options.id
- // })
- // }
- app.console("类型=================" + this.data.btn1)
+ app.console("order_id=================" + this.data.order_id)
+
},
mengceng() {
this.setData({
@@ -157,6 +145,27 @@ Page({
refund_box: false
})
},
+ //确认开始服务
+ startService(){
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/view/startServiceWithOrder',
+ header: app.getRequestHeader(),
+ method: 'post',
+ data: {
+ orderId: that.data.order_id
+ },
+ success: function (res) {
+ var resp = res.data;
+ if (res.data.code == 200) {
+ // that.setData({
+ // item : res.data.data
+ // });
+ }
+ }
+ });
+
+ },
seeQcode() {
console.log('点击了查看二维码')
//console.log(that.data.order_id)
@@ -483,27 +492,17 @@ Page({
getOrderDetail: function () {
var that = this;
wx.request({
- url: app.buildUrl("/app/Goddesswechat/getOrderDetail"),
+ url: app.globalData.url + '/system/view/getInfo',
header: app.getRequestHeader(),
- method: 'POST',
+ method: 'get',
data: {
- version_number: this.data.version_number,
- uid: wx.getStorageSync('uid'),
- token: wx.getStorageSync('token'),
- order_id: this.data.order_id
+ orderId: this.data.order_id
},
success: function (res) {
var resp = res.data;
- console.log(resp + "=================dddddddddddddddddddddddddddddddddddddddddddd")
- console.log(resp.erro + "=================dddddddddddddddddddddddddddddddddddddddddddd")
- if (resp.erro == 0) {
+ if (res.data.code == 200) {
that.setData({
- detail: resp.detail,
- order: resp.order,
- goods_id: resp.detail.goods_id,
- id: resp.detail.id,
- refund: resp.detail.refund,
- charge_phone: resp.detail.charge_phone
+ item : res.data.data
});
}
}
diff --git a/pages/orderdetail/orderdetail.wxml b/pages/orderdetail/orderdetail.wxml
index 2b52f67..7284f7e 100644
--- a/pages/orderdetail/orderdetail.wxml
+++ b/pages/orderdetail/orderdetail.wxml
@@ -4,12 +4,12 @@
-
{{"已取消"}}
{{"拒绝接单"}}
- {{"待付款"}}
- {{"已付款"}}
+ {{"待接单"}}
+ {{"已接单"}}
{{"待服务"}}
{{"服务中"}}
{{"已完成"}}
@@ -19,7 +19,7 @@
{{"已结算"}}
-
+
专业陪护服务({{item.userbName}})
@@ -30,7 +30,7 @@
-
+
@@ -54,11 +54,35 @@
+
+
+
+
+ 付款
+
+
+ 取消订单
+
+
+
+
+
+
+
-
- 查看身份码
+
+ 确认开始服务
退款
diff --git a/pages/paysuccess/paysuccess.js b/pages/paysuccess/paysuccess.js
deleted file mode 100644
index f18e70a..0000000
--- a/pages/paysuccess/paysuccess.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/paysuccess/paysuccess.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/paysuccess/paysuccess.json b/pages/paysuccess/paysuccess.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/paysuccess/paysuccess.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/paysuccess/paysuccess.wxml b/pages/paysuccess/paysuccess.wxml
deleted file mode 100644
index cda11cd..0000000
--- a/pages/paysuccess/paysuccess.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pages/paysuccess/paysuccess.wxml
diff --git a/pages/paysuccess/paysuccess.wxss b/pages/paysuccess/paysuccess.wxss
deleted file mode 100644
index 3cd889c..0000000
--- a/pages/paysuccess/paysuccess.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/paysuccess/paysuccess.wxss */
\ No newline at end of file
diff --git a/shopping/pages/goddess/goddess.js b/shopping/pages/goddess/goddess.js
index d1b02a8..004a2c2 100644
--- a/shopping/pages/goddess/goddess.js
+++ b/shopping/pages/goddess/goddess.js
@@ -2,394 +2,284 @@ const app = getApp()
Page({
- /**
- * 页面的初始数据
- */
- data: {
- text: '',
- texttwo: '',
- height: '',
- show: false,
- seckill_status: 1,
- seckill_start: '请输入开始日期',
- seckill_endx: '请输入结束日期',
- time: 30 * 60 * 60 * 1000,
- timeflag: 0,
- seckill_end: '',
- userInfo: {},
- item: {},
- url: app.globalData.url,
- hasUserInfo: false,
- date: '',
- paymoney:0,
- show: false,
- canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName'),
- phone: wx.getStorageSync('phone'),
- uidFlag: wx.getStorageSync('uidFlag'),
- imgUrls: [
- '/pages/image/goddess.jpg',
- '/pages/image/goddess.jpg',
- '/pages/image/goddess.jpg'
- ],
- goods_detail_img: [],
- indicatorDots: true,
- autoplay: true,
- interval: 5000,
- duration: 1300,
- id: 0,
- bg: '#C79C77',
- order_id: '',
- timeData: {},
- Height: "", //这是swiper要动态设置的高度属性
- charge_phone: '',
- is_ok_click: false,
- clock: '',
- address: '',
- danjia:0.01
- },
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ height: '',
+ seckill_start: '请输入开始日期',
+ seckill_endx: '请输入结束日期',
+ time: 30 * 60 * 60 * 1000,
+ timeflag: 0,
+ userInfo: {},
+ item: {},
+ hasUserInfo: false,
+ date: '',
+ paymoney: 0,
+ phone: wx.getStorageSync('phone'),
+ uidFlag: wx.getStorageSync('uidFlag'),
+ goods_detail_img: [],
+ indicatorDots: true,
+ autoplay: true,
+ interval: 5000,
+ duration: 1300,
+ id: 0,
+ order_id: '',
+ timeData: {},
+ Height: "", //这是swiper要动态设置的高度属性
+ charge_phone: '',
+ is_ok_click: false,
+ clock: '',
+ address: '',
+ danjia: 0.01,
+ beizhu: '123456',
+ },
- onDisplay() {
- this.setData({
- show: true
- });
- },
- onClose() {
- this.setData({
- show: false
- });
- },
- formatDate(date) {
- date = new Date(date);
- return `${date.getMonth() + 1}/${date.getDate()}`;
- },
- onConfirm(event) {
- this.setData({
- show: false,
- text: `选择了 ${event.detail.length} 个日期`,
- texttwo: this.formatDate(event.detail),
- });
- },
- // 确认支付
- confirm_pay: async function () {
- var that = this;
- if (!this.data.is_ok_click) {
- that.setData({
- is_ok_click: true
- })
- //你要执行的操作
- this.payment()
- setTimeout(function () {
- that.setData({
- is_ok_click: false
- })
- }, 10000) //阻止一秒点击多次
- } else {
- // wx.showToast({ title:'请勿重复操作!', icon: 'none' });
- }
- },
- //获取单价
- getprice: function () {
- var that = this;
- wx.request({
- url: app.globalData.url + '/system/config/configKey/price',
- header: app.getRequestHeader(),
- method: 'GET',
- data: {},
- success: (res) => {
- var resp = res.data;
- if (res.data.code == 200) {
- that.setData({
- special_offer: resp.data,
- });
- }
- }
- });
- },
- //获取类型
- getpriceType: function () {
- var that = this;
- wx.request({
- url: app.globalData.url + '/system/config/configKey/priceType',
- header: app.getRequestHeader(),
- method: 'GET',
- data: {},
- success: (res) => {
- var resp = res.data;
- if (res.data.code == 200) {
- that.setData({
- special_offer: resp.data,
- });
- }
- }
- });
- },
- payment() {
- if (this.data.seckill_start == "请输入开始日期") {
- wx.showToast({ title: '请输入开始日期', icon: 'none' });
- return
- }
- if (this.data.seckill_endx == "请输入结束日期") {
- wx.showToast({ title: '请输入结束日期', icon: 'none' });
- return
- }
- var that = this;
- wx.request({
- url: app.globalData.url + '/system/order',
- data: {
- startTime: this.data.seckill_start,
- endTime: this.data.seckill_endx,
- bId: this.data.item.userId,
- yuguMoney: "1",
- price: "10",
- priceType: "1",
- hospitalId: this.data.item.hospitalId,
- cId: wx.getStorageSync('uid')
- },
- method: 'POST',
- header: {
- 'content-type': 'application/json',
- 'Authorization': 'Bearer ' + app.getCache("token")
- },
- success(res) {
- if (res.data.code == 200) {
- 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('支付成功');
- wx.navigateTo({
- url: '/shopping/pages/paysuccess/paysuccess',
- })
- },
- fail(res) {
- console.log('支付失败');
- }
- })
- } else {
- wx.showToast({
- title: res.data.msg,
- icon: 'error',
- duration: 2000
- })
- }
- }
- // success(res) {
- // if (res.data.code == 200) {
- // that.setData({
- // // order_id: res.data.order_id,
- // order_id: 123456,
- // })
- // // wx.showToast({ title: res.data.msg, icon: 'none' });
- // wx.requestPayment({
- // timeStamp: res.data.data.timeStamp,
- // nonceStr: res.data.data.nonceStr,
- // package: res.data.data.package,
- // signType: 'MD5',
- // paySign: res.data.data.paySign,
- // success(res) {
- // console.log('支付成功');
- // wx.navigateTo({
- // url: '../paysuccess/paysuccess?' + '&order_id=' + that.data.order_id,
- // })
- // },
- // fail(res) {
- // console.log('支付失败');
- // }
- // })
- // } else {
- // wx.showToast({
- // title: res.data.msg,
- // icon: 'none'
- // });
-
- // }
- // }
+ // 确认支付
+ confirm_pay: async function () {
+ var that = this;
+ if (!this.data.is_ok_click) {
+ that.setData({
+ is_ok_click: true
+ })
+ //你要执行的操作
+ this.payment()
+ setTimeout(function () {
+ that.setData({
+ is_ok_click: false
})
- },
-
- //是否登录
- isdenglu() {
- wx.showModal({
- title: '提示',
- content: '请先登录',
+ }, 10000) //阻止一秒点击多次
+ } else {
+ // wx.showToast({ title:'请勿重复操作!', icon: 'none' });
+ }
+ },
+ //获取单价
+ getprice: function () {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/config/configKey/price',
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {},
+ success: (res) => {
+ var resp = res.data;
+ if (res.data.code == 200) {
+ that.setData({
+ special_offer: resp.data,
+ });
+ }
+ }
+ });
+ },
+ //获取类型
+ getpriceType: function () {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/config/configKey/priceType',
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {},
+ success: (res) => {
+ var resp = res.data;
+ if (res.data.code == 200) {
+ that.setData({
+ special_offer: resp.data,
+ });
+ }
+ }
+ });
+ },
+ payment() {
+ if (this.data.seckill_start == "请输入开始日期") {
+ wx.showToast({
+ title: '请输入开始日期',
+ icon: 'none'
+ });
+ return
+ }
+ if (this.data.seckill_endx == "请输入结束日期") {
+ wx.showToast({
+ title: '请输入结束日期',
+ icon: 'none'
+ });
+ return
+ }
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/order',
+ data: {
+ startTime: this.data.seckill_start,
+ endTime: this.data.seckill_endx,
+ bId: this.data.item.userId,
+ yuguMoney: "1",
+ price: "10",
+ priceType: "1",
+ hospitalId: this.data.item.hospitalId,
+ cId: wx.getStorageSync('uid'),
+ remark: "1234567890",
+ },
+ method: 'POST',
+ header: {
+ 'content-type': 'application/json',
+ 'Authorization': 'Bearer ' + app.getCache("token")
+ },
success(res) {
- if (res.confirm) {
- console.log('用户点击确定')
- wx.switchTab({
- url: '/pages/my/my'
+ if (res.data.code == 200) {
+ that.setData({
+ order_id: res.data.data.orderId,
})
- } else if (res.cancel) {
- console.log('用户点击取消')
- wx.switchTab({
- url: '/pages/my/my'
+ console.log('order_id==' + res.data.data.orderId)
+ app.console(that.data.order_id + "======要传的order_id")
+ 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,
+ icon: 'error',
+ duration: 2000
})
}
}
})
},
- bindDateChange: function (e) {
- this.setData({
- seckill_start: e.detail.value
- })
- },
- bindDateChangetwo: function (e) {
- this.setData({
- seckill_endx: e.detail.value,
- })
- var day = this.checkDate()
- this.setData({
- paymoney:this.data.danjia*day
- })
- },
- checkDate: function() {
- //日期格式化
- var start_date = new Date(this.data.seckill_start.replace(/-/g, "/"));
- var end_date = new Date(this.data.seckill_endx.replace(/-/g, "/"));
- //转成毫秒数,两个日期相减
- var ms = end_date.getTime() - start_date.getTime();
- //转换成天数
- var day = parseInt(ms / (1000 * 60 * 60 * 24));
- //do something
- console.log("day = ", day);
- return day
- },
- onClickLeft() {
- wx.navigateBack()
- },
- onChange(e) {
- this.setData({
- timeData: e.detail,
- });
-
- },
- imgHeight: function (e) {
- var winWid = wx.getSystemInfoSync().windowWidth; //获取当前屏幕的宽度
- var imgh = e.detail.height; //图片高度
- var imgw = e.detail.width; //图片宽度
- var swiperH = winWid * imgh / imgw + "px" //等比设置swiper的高度。 即 屏幕宽度 / swiper高度 = 图片宽度 / 图片高度 ==》swiper高度 = 屏幕宽度 * 图片高度 / 图片宽度
- this.setData({
- Height: swiperH //设置高度
- })
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (e) {
- var statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
- app.console(statusBarHeight + "=================xxxxxxxxxxxxxxxxxxxxxxxx")
- this.setData({
- statusBarHeight: statusBarHeight,
- height: 46 + statusBarHeight,
- });
- app.console(this.data.height + "=================xxxxxxxxxxxxxxxxxxxxxxxx")
- console.log(wx.getStorageSync('uidFlag'))
- console.log(wx.getStorageSync('uid'))
- if (wx.getStorageSync('phone') == '') {
- wx.setStorageSync('uidFlag', false);
- console.log('请登录')
- wx.showModal({
- title: '提示',
- content: '请先登录',
- success(res) {
- if (res.confirm) {
- console.log('用户点击确定')
- wx.switchTab({
- url: '/pages/my/my'
- })
- } else if (res.cancel) {
- console.log('用户点击取消')
- wx.switchTab({
- url: '/pages/my/my'
- })
- }
- }
- })
- }
+ bindDateChange: function (e) {
+ this.setData({
+ seckill_start: e.detail.value
+ })
+ },
+ bindDateChangetwo: function (e) {
+ this.setData({
+ seckill_endx: e.detail.value,
+ })
+ var day = this.checkDate()
+ this.setData({
+ paymoney: this.data.danjia * day
+ })
+ },
+ checkDate: function () {
+ //日期格式化
+ var start_date = new Date(this.data.seckill_start.replace(/-/g, "/"));
+ var end_date = new Date(this.data.seckill_endx.replace(/-/g, "/"));
+ //转成毫秒数,两个日期相减
+ var ms = end_date.getTime() - start_date.getTime();
+ //转换成天数
+ var day = parseInt(ms / (1000 * 60 * 60 * 24));
+ //do something
+ console.log("day = ", day);
+ return day + 1
+ },
+ onClickLeft() {
+ wx.navigateBack()
+ },
+ onChange(e) {
+ this.setData({
+ timeData: e.detail,
+ });
- var that = this;
- let item = JSON.parse(e.item);
- that.setData({
- item: item
- });
- var myDate = new Date();
- myDate.getDate();
- app.console("当前天=" + myDate.toLocaleDateString())
- },
- /**
- * 拨打电话
- */
- callphone() {
- wx.makePhoneCall({
- phoneNumber: this.data.charge_phone,
- })
- },
+ },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (e) {
+ var statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
+ this.setData({
+ statusBarHeight: statusBarHeight,
+ height: 46 + statusBarHeight,
+ });
+ var that = this;
+ let item = JSON.parse(e.item);
+ that.setData({
+ item: item
+ });
+ },
+ /**
+ * 拨打电话
+ */
+ callphone() {
+ wx.makePhoneCall({
+ phoneNumber: this.data.charge_phone,
+ })
+ },
- },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+ var that = this;
+ this.getprice();
+ this.getpriceType();
+ },
- var that = this;
- this.getprice();
- this.getpriceType();
- },
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
+ },
- },
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
+ },
- },
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
+ },
- },
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
+ },
- },
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
- login: function (e) {
-
- },
-
-})
+ },
+ login: function (e) {
+ },
+})
\ No newline at end of file
diff --git a/shopping/pages/goddess/goddess.wxml b/shopping/pages/goddess/goddess.wxml
index f21d49e..0e63183 100644
--- a/shopping/pages/goddess/goddess.wxml
+++ b/shopping/pages/goddess/goddess.wxml
@@ -1,105 +1,91 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.nickName}}
- ({{"陪诊员"}})
- {{"男"}}
- {{"女"}}
- {{item.experience}}经验
-
-
- {{"简介:从事陪诊服务2年,服务细心,热情周到,有耐心、责任心强。"}}
-
-
-
+
+
+
+
+
-
-
-
-
- 电话:{{item.phonenumber}}
-
+
+
+ {{item.nickName}}
+ ({{"陪诊员"}})
+ {{"男"}}
+ {{"女"}}
+ {{item.experience}}经验
+
+
+ {{"简介:从事陪诊服务2年,服务细心,热情周到,有耐心、责任心强。"}}
+
-
- 地址:{{item.address}}
+
+
+
+
+
+
+ 电话:{{item.phonenumber}}
+
+
+
+ 地址:{{item.address}}
+
+
+
+
+ {{"陪护时间选择"}}
+
+
+
+
+ 开始日期
+
+
+
+ {{seckill_start}}
+
+
+
+
+
+ 结束日期
+
+
+
+ {{seckill_endx}}
+
+
+
+
+
+
+ {{"备注"}}
+
+
-
-
- {{"陪护时间选择"}}
-
-
-
-
-
-
- 开始日期
-
-
-
-
- {{seckill_start}}
-
-
-
-
-
- 结束日期
-
-
-
-
- {{seckill_endx}}
-
-
-
-
+
+
+
+
+
+ 计费说明:计费说明计费说明计费说明计费说明计费说明计费说明计费说明
+
-
-
- {{"备注"}}
-
-
-
-
-
-
-
-
-
-
- 计费说明:计费说明计费说明计费说明计费说明计费说明计费说明计费说明
-
-
-
-
-
-
- 需支付:
- {{paymoney}}
- 元
-
- 立即支付
+
+
+ 预计金额:
+ {{paymoney}}
+ 元
+ 提交订单
+
\ No newline at end of file
diff --git a/shopping/pages/paysuccess/paysuccess.js b/shopping/pages/paysuccess/paysuccess.js
index 28b6c58..996bc0c 100644
--- a/shopping/pages/paysuccess/paysuccess.js
+++ b/shopping/pages/paysuccess/paysuccess.js
@@ -58,15 +58,15 @@ Page({
*/
onLoad: function (options) {
var statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
- app.console(statusBarHeight+"=================xxxxxxxxxxxxxxxxxxxxxxxx")
this.setData({
statusBarHeight: statusBarHeight,
height: 46 + statusBarHeight,
});
- app.console(this.data.height+"=================xxxxxxxxxxxxxxxxxxxxxxxx")
+
this.setData({
order_id:options.order_id
})
+ app.console(this.data.order_id+"======传来的order_id")
this.paySuccess()
},
diff --git a/shopping/pages/paysuccess/paysuccess.wxml b/shopping/pages/paysuccess/paysuccess.wxml
index d6dbf6a..e8482d9 100644
--- a/shopping/pages/paysuccess/paysuccess.wxml
+++ b/shopping/pages/paysuccess/paysuccess.wxml
@@ -1,7 +1,7 @@
- 支付成功
+ 提交成功
可在个人中心“我的订单”中查看
-
+
diff --git a/shopping/pages/paysuccess/paysuccess.wxss b/shopping/pages/paysuccess/paysuccess.wxss
index f8e37d7..28705ea 100644
--- a/shopping/pages/paysuccess/paysuccess.wxss
+++ b/shopping/pages/paysuccess/paysuccess.wxss
@@ -90,6 +90,16 @@
background: linear-gradient(312deg, #1B56FF 0%, #2D7AFF 0%, #00DBFC 100%);
}
+.btn1 {
+ font-weight: 300;
+ width: 244rpx;
+ height: 80rpx;
+ border-radius: 310rpx;
+ font-size: 30rpx;
+ color: rgb(4, 59, 240);
+ background: linear-gradient(312deg, #eeeff3 0%, #fff 0%, #e6edee 100%);
+}
+
.price {
display: flex;
margin-top: 8rpx;