diff --git a/app.js b/app.js
index 4085ac7..42b8d02 100644
--- a/app.js
+++ b/app.js
@@ -15,14 +15,11 @@ App({
encryptedData: '',
iv: '',
code: '',
-
-
url: 'http://chengjie.free.idcfengye.com',
phone: '',
uid: '',
sessionKey: '',
version_number: '1.0.0',
-
},
console: function (msg) {
console.log(msg);
diff --git a/app.json b/app.json
index 7561a92..d4c6768 100644
--- a/app.json
+++ b/app.json
@@ -20,6 +20,7 @@
"pages/wodeqianbao/qianbao",
"pages/refund/refund",
"pages/peihu"
+
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/image/no_order.png b/pages/image/no_order.png
new file mode 100644
index 0000000..17bd92d
Binary files /dev/null and b/pages/image/no_order.png differ
diff --git a/pages/order/order.js b/pages/order/order.js
index de553dd..5f3fbfa 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -23,7 +23,6 @@ Page({
currentType: curType,
pageNum: 1
});
-
this.getOrderList();
},
onClickLeft() {
@@ -42,45 +41,15 @@ Page({
//条目点击---订单状态：-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)
+ console.log("列表条目的index==" + e.currentTarget.dataset.index)
//去订单详情页
if (e.currentTarget.dataset.item != 0) {
let item = JSON.stringify(e.currentTarget.dataset.item);
- console.log("传递的item" + item);
+ //console.log("传递的item" + item);
wx.navigateTo({
url: "/pages/orderdetail/orderdetail?item=" + item,
});
- }
-
-
-
- if (this.data.order_list[e.currentTarget.dataset.index].status == '已取消订单') {
- wx.navigateTo({
- url: '/pages/orderdetail/orderdetail?' + "type=" + '1' + '&id=' + this.data.order_list[e.currentTarget.dataset.index].order_id,
- })
- }
-
- if (this.data.order_list[e.currentTarget.dataset.index].status == '待退款') {
- wx.navigateTo({
- url: '/pages/reforderdetail/reforderdetail?' + "type=" + '4' + '&id=' + e.currentTarget.dataset.id,
- })
- }
-
- if (this.data.order_list[e.currentTarget.dataset.index].status == '退款驳回') {
- wx.navigateTo({
- url: '/pages/reforderdetail/reforderdetail?' + "type=" + '1' + '&id=' + e.currentTarget.dataset.id,
- })
- }
-
- if (this.data.order_list[e.currentTarget.dataset.index].status == '已退款') {
- wx.navigateTo({
- url: '/pages/reforderdetail/reforderdetail?' + "type=" + '2' + '&id=' + e.currentTarget.dataset.id,
- })
- }
- // wx.navigateTo({
- // url: '/pages/orderdetail/orderdetail?'+"type="+'1'+ '&id=' +e.currentTarget.dataset.id,
- // })
+ }
},
//跳转订单详情（去付款）
go_pay(e) {
@@ -214,7 +183,6 @@ Page({
},
success: (res) => {
var resp = res.data;
- console.log(resp + "===========订单")
if (res.data.code == 200) {
if (this.data.pageNum == 1) {
that.setData({
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 5942d66..3f1ac7f 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -7,14 +7,14 @@
-
+
暂无订单
-
+
订单号：{{item.orderNumber}}
diff --git a/pages/orderdetail/orderdetail.js b/pages/orderdetail/orderdetail.js
index f0f9e40..fe1f375 100644
--- a/pages/orderdetail/orderdetail.js
+++ b/pages/orderdetail/orderdetail.js
@@ -1,5 +1,6 @@
//获取应用实例
var app = getApp();
+// pages/peihu.js
Page({
/**
@@ -39,26 +40,15 @@ Page({
}
],
show: false,
- statusType: ["拼团"],
- status: ["0"],
- currentType: 0,
- nav_type: 0,
- is_ok_click: false,
+
+
+
+
height: ''
+
+
},
- onClickShow() {
- this.setData({
- show: true
- });
- },
-
- onClickHide() {
- this.setData({
- show: false
- });
- },
-
/**
* 生命周期函数--监听页面加载
*/
@@ -69,12 +59,12 @@ Page({
height: 46 + statusBarHeight,
});
//条目点击进入详情页
- this.setData({
- order_id: e.id
- })
+ // this.setData({
+ // order_id: e.id
+ // })
//条目点击进入详情页,调取接口获取详情页数据，除外都是通过列表传参的方式展示详情页数据。
- if(e.type=3){
- this.getOrderDetail();
+ if (e.type = 3) {
+ this.getOrderDetail();
}
var that = this;
@@ -84,334 +74,52 @@ Page({
charge_phone: 18133233292,
order_id: item.orderId
});
- app.console("order_id=================" + this.data.order_id)
- },
- mengceng() {
- this.setData({
- dingdan_msg: false,
- ewm_msg: false,
- mengceng: false,
- refund_box: false
- })
- },
- mengcengfwz() {
- this.setData({
- dingdan_msgfwz: false,
- ewm_msg: false,
- mengcengfwz: false,
- 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
- // });
- }
- }
- });
-
+ console.log("进入订单详情的status==" + that.data.item.status)
+ console.log("进入订单详情的orderId==" + that.data.item.orderId)
+ console.log("进入订单详情的orderNumber==" + that.data.item.orderNumber)
},
- cancelOrder() {
- console.log('点击了取消订单')
- this.setData({
- dingdan_msg: true,
- mengceng: true
- })
- },
- cancelOrderfwz() {
- console.log('点击了取消订单')
- this.setData({
- dingdan_msgfwz: true,
- mengcengfwz: true
- })
- },
- okcancel() {
- var that = this;
- wx.request({
- // url: app.globalData.url + '/system/order/concelOrder/' + this.data.item.orderId,
- url: app.globalData.url + '/system/order/refundOrder/' + this.data.item.orderId,
- header: app.getRequestHeader(),
- method: 'GET',
- data: {
- // id: this.data.item.orderId,
- },
- success: (res) => {
- var resp = res.data;
- if (res.data.code == 200) {
- wx.showToast({
- title: res.data.msg,
- icon: 'none'
- });
- setTimeout(function () {
- //要延时执行的代码
- wx.navigateBack()
- }, 2000) //延迟时间 这里是2秒
- }
- }
- });
-
- console.log('点击了坚持取消');
- // var _this=this;
- // wx.request({
- // url: app.globalData.url + '/app/Goddesswechat/cancelOrder',
- // data: {
- // version_number: app.globalData.version_number,
- // uid: wx.getStorageSync('uid'),
- // token:wx.getStorageSync('token'),
- // order_id:this.data.order_id
- // },
- // method: 'POST',
- // header: { 'content-type': 'application/x-www-form-urlencoded' },
- // success(res) {
- // console.log(1111111)
- // console.log(res)
- // if (res.data.erro == 0) {
- // wx.showToast({ title: res.data.msg, icon: 'none' });
- // }else{
-
- // }
- // }
- // }
- // )
-
-
- this.setData({
- dingdan_msg: false,
- mengceng: false
- })
- },
- nocancel() {
- this.setData({
- dingdan_msg: false,
- mengceng: false
- })
- },
- /**
- * 拨打电话
- */
- callphone() {
- wx.makePhoneCall({
-
- phoneNumber: this.data.charge_phone,
-
- })
- },
- /**
- * 发起拼团
- */
- pintuan() {
- this.setData({
- show: true
- });
- },
- tiaoguo() {
- this.setData({
- show: false
- });
- },
- /**
- * 同意发起
- */
- tongyifaqi() {
- this.confirmCollage()
- },
-
- refund() {
-
- var that = this;
- wx.request({
- // url: app.globalData.url + '/system/order/concelOrder/' + this.data.item.orderId,
- url: app.globalData.url + '/system/order/refundOrder/' + this.data.item.orderId,
- header: app.getRequestHeader(),
- method: 'GET',
- data: {
- // id: this.data.item.orderId,
- },
- success: (res) => {
- var resp = res.data;
- if (res.data.code == 200) {
- wx.showToast({
- title: res.data.msg,
- icon: 'none'
- });
- setTimeout(function () {
- //要延时执行的代码
- wx.navigateBack()
- }, 2000) //延迟时间 这里是2秒
- }
- }
- });
-
-
-
-
-
-
-
- if (this.data.refund == 0) {
- app.tip({
- content: '该订单不支持退款'
- });
- return
- }
-
- wx.navigateTo({
- url: '/pages/reforderdetail/reforderdetail?' + "type=" + '3' + '&id=' + this.data.id,
- })
-
- // this.setData({
- // refund_box:true,
- // mengceng:true
- // })
- },
- gang() {
- this.setData({
- refund_box: false,
- mengceng: false
- })
- },
- // 确认支付
- confirm_pay: async function () {
- var that = this;
- if (!this.data.is_ok_click) {
- that.setData({
- is_ok_click: true
- })
-
-
- //你要执行的操作
- this.godetail()
- setTimeout(function () {
- that.setData({
- is_ok_click: false
- })
- }, 10000) //阻止一秒点击多次
- } else {
- // wx.showToast({
- // title: '请勿重复操作！',
- // })
- }
- },
-
- godetail() {
- console.log('点击了去付款');
- var _this = this;
- console.log(this.data.id + 'tttttttttttttttttttttttttttttttttt')
- wx.request({
- // url: app.globalData.url + '/system/weixinPayNew/12345666',
- //order_id为8位数字
- url: app.globalData.url + '/system/order/weixinPay/' + this.data.item.orderId,
- header: app.getRequestHeader(),
- method: 'GET',
- data: {
-
- },
- 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
- })
- }
- }
- })
- },
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady: function () {
+ onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function () {
- // this.getOrderDetail();
- //假数据
- var that = this;
- if (this.data.resp.erro == 0) {
- that.setData({
- detail: this.data.resp.detail,
- order: this.data.resp.order,
- goods_id: this.data.resp.detail.goods_id,
- id: this.data.resp.detail.id,
- refund: this.data.resp.detail.refund,
- charge_phone: this.data.resp.detail.charge_phone
- });
- }
+ onShow() {
+
},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide: function () {
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
},
onClickLeft() {
wx.navigateBack()
},
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh: function () {
+ onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
+ onReachBottom() {
},
//订单详情
@@ -434,4 +142,209 @@ Page({
}
});
},
+ /**
+ * 订单状态：0：待接单 1：已接单 时候的取消订单
+ */
+ cancelOrder() {
+ this.setData({
+ dingdan_msg: true,
+ mengceng: true
+ })
+ },
+ /**
+ * 订单状态：2：待服务 时候的取消订单
+ */
+ cancelOrderdfw() {
+ this.setData({
+ dingdan_msg: true,
+ mengceng: true
+ })
+ },
+ /**
+ * 订单状态：3：服务中 时候的取消订单
+ */
+ cancelOrderfwz() {
+ console.log('点击了取消订单')
+ this.setData({
+ dingdan_msgfwz: true,
+ mengceng: true
+ })
+ },
+ okcancel() {
+ console.log('点击了联系客服取消订单')
+ var that = this;
+ this.setData({
+ dingdan_msgfwz: false,
+ mengceng: false
+ })
+ },
+ /**
+ * 待接单/已接单时被坚持取消订单
+ */
+ cancelok() {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/order/concelOrder/' + this.data.order_id,
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {
+ // id: this.data.item.orderId,
+ },
+ success: (res) => {
+ if (res.data.code == 200) {
+ wx.showToast({
+ title: res.data.msg,
+ icon: 'none'
+ });
+ setTimeout(function () {
+ //要延时执行的代码
+ wx.navigateBack()
+ }, 2000) //延迟时间 这里是2秒
+ }
+ }
+ });
+ this.setData({
+ dingdan_msg: false,
+ mengceng: false
+ })
+ },
+ mengceng() {
+ this.setData({
+ dingdan_msg: false,
+ ewm_msg: false,
+ mengceng: false,
+ refund_box: false
+ })
+ },
+ mengcengfwz() {
+ this.setData({
+ dingdan_msgfwz: false,
+ mengcengfwz: false,
+ 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) {
+ wx.showToast({
+ title: res.data.msg,
+ })
+ setTimeout(function () {
+ //要延时执行的代码
+ wx.navigateBack()
+ }, 2000) //延迟时间 这里是2秒
+ }
+ }
+ });
+
+ },
+ /**
+ * 待服务时被坚持取消订单
+ */
+ cancelokdfw() {
+ //关闭服务人员正在赶来弹框
+ this.setData({
+ dingdan_msg: false,
+ mengceng: false
+ })
+ //打开退款原因弹框
+ this.setData({
+ refund_box: true,
+ mengceng: true
+ })
+ },
+ /**
+ * 填写原因开始退款
+ */
+ isok() {
+ this.refund()
+ },
+ /**
+ * 退款
+ */
+ refund() {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/order/refundOrder/' + this.data.order_id,
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {
+ // id: this.data.item.orderId,
+ },
+ success: (res) => {
+ var resp = res.data;
+ if (res.data.code == 200) {
+ wx.showToast({
+ title: '退款申请成功',
+ })
+ setTimeout(function () {
+ //要延时执行的代码
+ wx.navigateBack()
+ }, 2000) //延迟时间 这里是2秒
+ }
+ }
+ });
+
+ this.setData({
+ refund_box: false,
+ mengceng: false
+ })
+ },
+ nocancel() {
+ this.setData({
+ dingdan_msg: false,
+ dingdan_msgfwz: false,
+ mengceng: false
+ })
+ },
+ gang() {
+ this.setData({
+ refund_box: false,
+ mengceng: false
+ })
+ },
+ /**
+ * 拨打电话
+ */
+ callphone() {
+ wx.makePhoneCall({
+ phoneNumber: this.data.charge_phone,
+ })
+ },
+ //订单详情
+ getOrderDetail: function () {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/view/getInfo',
+ header: app.getRequestHeader(),
+ method: 'get',
+ data: {
+ orderId: this.data.order_id
+ },
+ success: function (res) {
+ var resp = res.data;
+ if (res.data.code == 200) {
+ that.setData({
+ item: res.data.data
+ });
+ }
+ }
+ });
+ },
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/orderdetail/orderdetail.wxml b/pages/orderdetail/orderdetail.wxml
index 4055067..3571b2c 100644
--- a/pages/orderdetail/orderdetail.wxml
+++ b/pages/orderdetail/orderdetail.wxml
@@ -1,6 +1,6 @@
-
+
@@ -28,116 +28,45 @@
-
-
-
-
-
- 取消订单
-
-
-
-
-
- 退款
-
-
+
+ 取消订单
-
-
- 付款
-
-
- 取消订单
-
+
+ 付款
+
+
+ 取消订单
-
-
-
-
-
- 确认开始服务
-
-
- 退款
-
+
+ 确认开始服务
+
+
+ 取消订单并退款
-
-
- 取消订单
-
+
+ 提前结束订单
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
联系信息
-
+
{{item.usercName}}
@@ -147,6 +76,8 @@
+
+
订单信息
@@ -172,6 +103,8 @@
{{123456789}}
+
+
@@ -181,35 +114,38 @@
我在想想
- 坚持取消
+ 坚持取消
-
-
+
+
- 请联系客服
+ 订单结束后按实际服务时间进行结算
我在想想
- 坚持取消
+ 确认结束服务
-
-
-
-
-
- 请到地址后
-
-
- 出示身份码给服务人员
-
+
+
+
+
+
+
+ 服务人员正在赶来，确定要取消订单吗？
+
+
+ 我在想想
+ 坚持取消
+
+
@@ -230,194 +166,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请好友拼团
- 拼团成功会返现哦~
-
-
+
+
+
+
+ 退款原因
+
+
+
+ {{item.text}}
+
+
+
-
-
-
-
-
-
- 拼团规则
-
-
-
-
- 1
-
- 支付
- 开团/参团
-
-
- >
-
- 2
-
- 邀请
- 好友参团
-
-
-
- >
-
- 3
-
- 返现
- 拼团成功返现
-
-
-
-
-
-
- 拼团详情
-
-
-
-
-
-
-
- {{detail.goods_name}}
-
-
-
-
- {{detail.mechanism_name}}
-
-
- ￥{{detail.total_money}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 团长
-
-
-
- ?
-
-
-
-
-
-
-
- 跳过
- 同意发起拼团
-
-
-
-
-
-
-
-
- 砍价规则
-
-
-
-
- 1
-
- 好友参团
- 开团/参团
-
-
- >
-
- 1
-
- 好友参团
- 开团/参团
-
-
-
- >
-
- 1
-
- 好友参团
- 开团/参团
-
-
-
-
-
-
- 特价商品
-
-
-
-
-
-
-
- 除皱瘦脸 韩国进口标准装瘦咬肌速美小V脸
-
-
-
-
- {{item.mechanism_name}}
-
-
- ￥{{item.price}}
- ￥{{item.original_price}}
-
-
-
-
-
-
-
-
-
-
-
- 跳过
- 同意发起砍价
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/orderdetail/orderdetailbeifen.js b/pages/orderdetail/orderdetailbeifen.js
index 43adb84..f0f9e40 100644
--- a/pages/orderdetail/orderdetailbeifen.js
+++ b/pages/orderdetail/orderdetailbeifen.js
@@ -73,9 +73,9 @@ Page({
order_id: e.id
})
//条目点击进入详情页,调取接口获取详情页数据，除外都是通过列表传参的方式展示详情页数据。
- // if(e.type=3){
- // this.getOrderDetail();
- // }
+ if(e.type=3){
+ this.getOrderDetail();
+ }
var that = this;
let item = JSON.parse(e.item);
diff --git a/pages/orderdetail/orderdetailbeifen.wxml b/pages/orderdetail/orderdetailbeifen.wxml
new file mode 100644
index 0000000..63a056e
--- /dev/null
+++ b/pages/orderdetail/orderdetailbeifen.wxml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+ {{"已取消"}}
+ {{"拒绝接单"}}
+ {{"待接单"}}
+ {{"已接单"}}
+ {{"待服务"}}
+ {{"服务中"}}
+ {{"已完成"}}
+ {{"申请退款"}}
+ {{"退款中"}}
+ {{"已退款"}}
+ {{"已结算"}}
+
+
+
+
+ 专业陪护服务（{{item.userbName}}）
+
+ 实付款：￥{{item.yuguMoney}}
+
+
+
+
+
+
+
+
+
+
+
+ 取消订单
+
+
+
+
+
+ 退款
+
+
+
+
+
+
+
+
+
+ 付款
+
+
+ 取消订单
+
+
+
+
+
+
+
+
+
+
+
+ 确认开始服务
+
+
+ 退款
+
+
+
+
+
+
+
+
+ 取消订单
+
+
+
+
+
+
+ 联系信息
+
+
+
+
+ {{item.usercName}}
+
+ 地址：{{item.hospitalAddress}}
+
+
+
+
+
+
+ 订单信息
+
+
+ 订单合计
+ ¥{{item.yuguMoney}}
+
+
+
+ 订单时间
+ {{item.startTime}}
+
+
+ 订单编号
+ {{item.orderNumber}}
+
+
+ 手机号码
+ {{123456789}}
+
+
+
+
+
+
+
+ 商品很抢手哦，确定要取消订单吗？
+
+
+ 我在想想
+ 坚持取消
+
+
+
+
+
+
+
+
+ 请联系客服
+
+
+ 我在想想
+ 坚持取消
+
+
+
+
+
+
+
+
+ 退款原因
+
+
+
+ {{item.text}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index c114301..b8cd1fa 100644
--- a/project.config.json
+++ b/project.config.json
@@ -45,7 +45,8 @@
"disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false,
- "useCompilerPlugins": false
+ "useCompilerPlugins": false,
+ "condition": false
},
"compileType": "miniprogram",
"libVersion": "2.21.0",