diff --git a/app.js b/app.js
index 41659fc..33c86a1 100644
--- a/app.js
+++ b/app.js
@@ -17,8 +17,8 @@ App({
code:'',
- // url:'http://chengjie468.gnway.cc:9090',
- url:'https://35q45673j2.goho.co',
+ url:'http://chengjie.free.idcfengye.com',
+ // url:'https://35q45673j2.goho.co',
phone:'',
diff --git a/pages/order/order.js b/pages/order/order.js
index 786e58f..d51b719 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -1,232 +1,250 @@
//获取应用实例
var app = getApp();
Page({
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ order_list: [],
+ nav_type: 1,
+ all: true,
+ height: '',
+ url: app.globalData.url,
- /**
- * 页面的初始数据
- */
- data: {
- order_list: [],
- nav_type: 1,
- all: true,
- height: '',
- url: app.globalData.url,
+ statusType: ["全部", "待付款", "未使用", "退款"],
+ status: ["", "1", "2", "3"],
+ currentType: 0,
+ tabClass: ["", "", "", "", "", ""],
+ pageNum: 1
+ },
+ statusTap: function (e) {
+ var curType = e.currentTarget.dataset.index;
+ this.setData({
+ currentType: curType,
+ pageNum: 1
+ });
- statusType: ["全部", "待付款", "未使用", "退款"],
- status: ["", "1", "2", "3"],
- currentType: 0,
- tabClass: ["", "", "", "", "", ""],
- pageNum: 1
- },
- statusTap: function (e) {
- var curType = e.currentTarget.dataset.index;
- this.setData({
- currentType: curType,
- pageNum: 1
- });
-
- this.getOrderList();
- },
- onClickLeft() {
- wx.navigateBack()
- },
- /**
- * 生命周期函数--监听页面加载
- */
- 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")
- },
- //条目点击
- itemclick(e) {
- // console.log(e.currentTarget.dataset.id)
- console.log(e.currentTarget.dataset.index)
- 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) {
- console.log(e.currentTarget.dataset.id)
- // wx.navigateTo({
- // url: '/pages/orderdetail/orderdetail?' + "type=" + '2' + '&id=' + e.currentTarget.dataset.id,
- // })
-
- 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,
- });
- }
- },
- go_Qcode(e) {
+ this.getOrderList();
+ },
+ onClickLeft() {
+ wx.navigateBack()
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ var statusBarHeight = wx.getSystemInfoSync().statusBarHeight;
+ this.setData({
+ statusBarHeight: statusBarHeight,
+ height: 46 + statusBarHeight,
+ });
+ },
+ //条目点击---订单状态:-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?' + "type=" + '3' + '&id=' + e.currentTarget.dataset.id,
- })
- },
- // 导航栏
- all_order() {
- this.setData({
- nav_type: 1,
- all: true
-
- })
- },
- payment_order() {
- this.setData({
- nav_type: 2,
- all: false
- })
- },
- use_order() {
- this.setData({
- nav_type: 3,
- all: false
- })
- },
- refund_order() {
- this.setData({
- nav_type: 4,
- all: false
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {},
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
- this.setData({
- order_list: [],
- pageNum: 1
- })
- this.getOrderList();
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
- //this.getOrderList();
- var that = this;
- wx.request({
- url: app.globalData.url + '/system/view/list',
- header: app.getRequestHeader(),
- method: 'GET',
- data: {
- pageNum: 1,
- pageSize: 30,
- status: that.data.status[that.data.currentType],
- usercId: 103
- },
- success: (res) => {
- var resp = res.data;
- if (res.data.code == 200) {
- that.setData({
- pageNum: 1,
- order_list: resp.data,
- });
- wx.stopPullDownRefresh({
- success: (res) => {},
- })
- }
- }
+ url: "/pages/orderdetail/orderdetail?item=" + item,
});
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
- console.log("=================dddddddddddddddddddddddddddddddddddddddddddd")
- this.getOrderList();
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
- //订单状态:-2:已取消 -1:拒绝接单 0:待付款 1:已付款 2:已接单(待服务)3:服务中 4:已完成 5申请退款 6退款中 7已退款 8:已结算
- getOrderList: function () {
- var that = this;
- wx.request({
- url: app.globalData.url + '/system/view/list',
- header: app.getRequestHeader(),
- method: 'GET',
- data: {
- pageNum: 1,
- pageSize: 30,
- status: that.data.status[that.data.currentType],
- usercId: 103
- },
- success: (res) => {
- var resp = res.data;
- console.log(resp + "===========订单")
- if (res.data.code == 200) {
- if (this.data.pageNum == 1) {
- that.setData({
- order_list: resp.data,
- pageNum: this.data.pageNum + 1
- });
-
- } else {
- that.setData({
- order_list: this.data.order_list.concat(resp.data),
- pageNum: this.data.pageNum + 1
- });
- }
- }
- }
+ }
+ }
+ //去取消订单详情
+ 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 (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) {
+ console.log(e.currentTarget.dataset.id)
+ // wx.navigateTo({
+ // url: '/pages/orderdetail/orderdetail?' + "type=" + '2' + '&id=' + e.currentTarget.dataset.id,
+ // })
+
+ 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,
+ });
+ }
+ },
+ go_Qcode(e) {
+ wx.navigateTo({
+ url: '/pages/orderdetail/orderdetail?' + "type=" + '3' + '&id=' + e.currentTarget.dataset.id,
+ })
+ },
+ // 导航栏
+ all_order() {
+ this.setData({
+ nav_type: 1,
+ all: true
+
+ })
+ },
+ payment_order() {
+ this.setData({
+ nav_type: 2,
+ all: false
+ })
+ },
+ use_order() {
+ this.setData({
+ nav_type: 3,
+ all: false
+ })
+ },
+ refund_order() {
+ this.setData({
+ nav_type: 4,
+ all: false
+ })
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {},
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+ this.setData({
+ order_list: [],
+ pageNum: 1
+ })
+ this.getOrderList();
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+ //this.getOrderList();
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/view/list',
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {
+ pageNum: 1,
+ pageSize: 30,
+ status: that.data.status[that.data.currentType],
+ usercId: 103
+ },
+ success: (res) => {
+ var resp = res.data;
+ if (res.data.code == 200) {
+ that.setData({
+ pageNum: 1,
+ order_list: resp.data,
+ });
+ wx.stopPullDownRefresh({
+ success: (res) => {},
+ })
+ }
+ }
+ });
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+ console.log("==页面上拉触底事件的处理函数==")
+ this.getOrderList();
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ //订单状态:-2:已取消 -1:拒绝接单 0:待付款 1:已付款 2:已接单(待服务)3:服务中 4:已完成 5申请退款 6退款中 7已退款 8:已结算
+ getOrderList: function () {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/view/list',
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {
+ pageNum: 1,
+ pageSize: 30,
+ status: that.data.status[that.data.currentType],
+ usercId: 103
+ },
+ success: (res) => {
+ var resp = res.data;
+ console.log(resp + "===========订单")
+ if (res.data.code == 200) {
+ if (this.data.pageNum == 1) {
+ that.setData({
+ order_list: resp.data,
+ pageNum: this.data.pageNum + 1
+ });
+
+ } else {
+ that.setData({
+ order_list: this.data.order_list.concat(resp.data),
+ pageNum: this.data.pageNum + 1
+ });
+ }
+ }
+ }
+ });
+ },
})
\ No newline at end of file
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 5722f27..d81099d 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -1,59 +1,55 @@
-
- {{item}}
-
-
+
+ {{item}}
+
+
-
- 暂无订单
+
+ 暂无订单
-
-
-
-
-
-
-
-
- 订单号:{{item.orderNumber}}
-
- {{"已取消"}}
- {{"拒绝接单"}}
- {{"待付款"}}
- {{"已付款"}}
- {{"待服务"}}
- {{"服务中"}}
- {{"已完成"}}
- {{"申请退款"}}
- {{"退款中"}}
- {{"已退款"}}
- {{"已结算"}}
-
-
-
-
-
-
-
- {{item.userbName}}
- {{item.serviceTime}}天
- 实付款:¥{{item.yuguMoney}}元
-
- 去付款
-
- 查看二维码
-
-
-
-
+ {{"已取消"}}
+ {{"拒绝接单"}}
+ {{"待付款"}}
+ {{"已付款"}}
+ {{"待服务"}}
+ {{"服务中"}}
+ {{"已完成"}}
+ {{"申请退款"}}
+ {{"退款中"}}
+ {{"已退款"}}
+ {{"已结算"}}
+
+
+
+
+
+
+ {{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 95646c4..97682e5 100644
--- a/pages/orderdetail/orderdetail.js
+++ b/pages/orderdetail/orderdetail.js
@@ -119,7 +119,7 @@ Page({
console.log(e.id)
//条目点击进入详情页
this.setData({
- btn1: 2,
+ // btn1: 2,
order_id: e.id
})
diff --git a/pages/orderdetail/orderdetail.wxml b/pages/orderdetail/orderdetail.wxml
index bb59764..2b52f67 100644
--- a/pages/orderdetail/orderdetail.wxml
+++ b/pages/orderdetail/orderdetail.wxml
@@ -1,139 +1,187 @@
-
-
-
-
- {{"已取消"}}
- {{"拒绝接单"}}
- {{"待付款"}}
- {{"已付款"}}
- {{"待服务"}}
- {{"服务中"}}
- {{"已完成"}}
- {{"申请退款"}}
- {{"退款中"}}
- {{"已退款"}}
- {{"已结算"}}
-
-
-
-
- 专业陪护服务({{item.userbName}})
-
- 实付款:¥{{item.yuguMoney}}
-
+ {{"已取消"}}
+ {{"拒绝接单"}}
+ {{"待付款"}}
+ {{"已付款"}}
+ {{"待服务"}}
+ {{"服务中"}}
+ {{"已完成"}}
+ {{"申请退款"}}
+ {{"退款中"}}
+ {{"已退款"}}
+ {{"已结算"}}
+
+
+
+
+ 专业陪护服务({{item.userbName}})
+
+ 实付款:¥{{item.yuguMoney}}
+
-
-
-
- 付款
-
-
- 取消订单
-
+
+
+
+
+
+
+ 付款
-
-
- 查看身份码
-
-
- 退款
-
-
-
+
+
+
+
+
+
+ 查看身份码
+
+
+ 退款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 联系信息
-
-
-
-
- {{item.usercName}}
-
- 地址:{{item.hospitalAddress}}
-
-
+ 联系信息
+
+
+
+
+ {{item.usercName}}
+
+ 地址:{{item.hospitalAddress}}
+
+
-
- 订单信息
-
-
- 订单合计
- ¥{{item.yuguMoney}}
-
-
-
- 订单时间
- {{item.startTime}}
-
-
- 订单编号
- {{item.orderNumber}}
-
-
- 手机号码
- {{123456789}}
-
+
+ 订单时间
+ {{item.startTime}}
+
+
+ 订单编号
+ {{item.orderNumber}}
+
+
+ 手机号码
+ {{123456789}}
+
-
- 商品很抢手哦,确定要取消订单吗?
-
-
- 我在想想
- 坚持取消
-
+
+ 商品很抢手哦,确定要取消订单吗?
+
+
+ 我在想想
+ 坚持取消
+
-
-
-
- 请到地址后
-
-
- 出示身份码给服务人员
-
+
+
+
+ 请到地址后
+
+ 出示身份码给服务人员
+
+
-
-
- 退款原因
-
-
-
- {{item.text}}
-
-
-
-
-
-
-
-
+
+
+ 退款原因
+
+
+
+ {{item.text}}
+
+
+
+
+
+
+
+
@@ -151,188 +199,188 @@
-
-
-
+
+
+
-
+
-
+
- 邀请好友拼团
- 拼团成功会返现哦~
+ 邀请好友拼团
+ 拼团成功会返现哦~
-
+
-
-
- {{item}}
-
-
-
-
-
-
-
-
-
- 拼团规则
-
-
-
-
- 1
-
- 支付
- 开团/参团
-
-
- >
-
- 2
-
- 邀请
- 好友参团
-
-
-
- >
-
- 3
-
- 返现
- 拼团成功返现
-
-
-
-
-
-
- 拼团详情
-
-
-
-
-
-
-
- {{detail.goods_name}}
-
-
-
-
- {{detail.mechanism_name}}
-
-
- ¥{{detail.total_money}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 团长
-
-
-
- ?
-
-
-
-
-
-
-
- 跳过
- 同意发起拼团
-
-
-
-
-
-
-
-
- 砍价规则
-
-
-
-
- 1
-
- 好友参团
- 开团/参团
-
-
- >
-
- 1
-
- 好友参团
- 开团/参团
-
-
-
- >
-
- 1
-
- 好友参团
- 开团/参团
-
-
-
-
-
-
- 特价商品
-
-
-
-
-
-
-
- 除皱瘦脸 韩国进口标准装瘦咬肌速美小V脸
-
-
-
-
- {{item.mechanism_name}}
-
-
- ¥{{item.price}}
- ¥{{item.original_price}}
-
-
-
-
-
-
-
-
-
-
-
- 跳过
- 同意发起砍价
-
-
-
-
-
-
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+ 拼团规则
+
+
+
+
+ 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
diff --git a/pages/orderdetail/orderdetail.wxss b/pages/orderdetail/orderdetail.wxss
index edbc53b..6168a74 100644
--- a/pages/orderdetail/orderdetail.wxss
+++ b/pages/orderdetail/orderdetail.wxss
@@ -84,7 +84,7 @@ page {
color: #FF4A4A;
opacity: 1;
text-align: center;
-
+ right:200rpx;color:#4A4A4A;border: 1rpx solid #4A4A4A;padding:0 30rpx
}
.contact {
@@ -216,6 +216,16 @@ page {
border-bottom: 1rpx solid #E8E8E8;
}
+.opt_view {
+ height:105rpx;position: relative;background: #ffffff;margin-top:4rpx;
+}
+
+.opt_bt_view {
+ right:200rpx;color:#4A4A4A;border: 1rpx solid #4A4A4A;padding:0 30rpx
+}
+
+
+
diff --git a/pages/peihu/peihu.wxml b/pages/peihu/peihu.wxml
index 56ca010..ebb54e9 100644
--- a/pages/peihu/peihu.wxml
+++ b/pages/peihu/peihu.wxml
@@ -25,7 +25,7 @@
-
+
diff --git a/shopping/pages/goddess/goddess.wxml b/shopping/pages/goddess/goddess.wxml
index 524e4b0..f21d49e 100644
--- a/shopping/pages/goddess/goddess.wxml
+++ b/shopping/pages/goddess/goddess.wxml
@@ -10,7 +10,7 @@
-
+