diff --git a/packageA/pages/my_service/tment_eval.js b/packageA/pages/my_service/tment_eval.js index 74d45e4..d5f6c5f 100644 --- a/packageA/pages/my_service/tment_eval.js +++ b/packageA/pages/my_service/tment_eval.js @@ -192,7 +192,7 @@ Page({ var namber=th.data.number; setTimeout(function() { wx.redirectTo({ - url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 + url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 }); }, 2000); } else { diff --git a/packageA/pages/my_service/tment_order_list.wxml b/packageA/pages/my_service/tment_order_list.wxml index c3d41aa..2d368a6 100644 --- a/packageA/pages/my_service/tment_order_list.wxml +++ b/packageA/pages/my_service/tment_order_list.wxml @@ -23,7 +23,7 @@ - + diff --git a/packageA/pages/my_service2/tment_eval.js b/packageA/pages/my_service2/tment_eval.js index 74d45e4..d5f6c5f 100644 --- a/packageA/pages/my_service2/tment_eval.js +++ b/packageA/pages/my_service2/tment_eval.js @@ -192,7 +192,7 @@ Page({ var namber=th.data.number; setTimeout(function() { wx.redirectTo({ - url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 + url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 }); }, 2000); } else { diff --git a/packageA/pages/my_service2/tment_order_list.wxml b/packageA/pages/my_service2/tment_order_list.wxml index c3d41aa..2d368a6 100644 --- a/packageA/pages/my_service2/tment_order_list.wxml +++ b/packageA/pages/my_service2/tment_order_list.wxml @@ -23,7 +23,7 @@ - + diff --git a/pages/payment/payment/payment.js b/packageG/pages/payment/payment/payment.js index 4552b05..4552b05 100644 --- a/pages/payment/payment/payment.js +++ b/packageG/pages/payment/payment/payment.js diff --git a/pages/payment/payment/payment.json b/packageG/pages/payment/payment/payment.json index 311144d..311144d 100644 --- a/pages/payment/payment/payment.json +++ b/packageG/pages/payment/payment/payment.json diff --git a/pages/payment/payment/payment.wxml b/packageG/pages/payment/payment/payment.wxml index 7b53e88..7b53e88 100644 --- a/pages/payment/payment/payment.wxml +++ b/packageG/pages/payment/payment/payment.wxml diff --git a/pages/payment/payment/payment.wxss b/packageG/pages/payment/payment/payment.wxss index bab6bda..bab6bda 100644 --- a/pages/payment/payment/payment.wxss +++ b/packageG/pages/payment/payment/payment.wxss diff --git a/packageG/pages/user/my_service/appment_main.js b/packageG/pages/user/my_service/appment_main.js index 034182c..fcc4b48 100644 --- a/packageG/pages/user/my_service/appment_main.js +++ b/packageG/pages/user/my_service/appment_main.js @@ -150,7 +150,7 @@ Page({ "keyword": res.data.data.Address } ], - "page": "/pages/user/my_service/tment_details?number=" + number, + "page": "/packageG/pages/user/my_service/tment_details?number=" + number, "storeId": a.stoid, "typeId": "1011", "userId": d.user_id @@ -168,7 +168,7 @@ Page({ }) setTimeout(function() { wx.redirectTo({ - url: "/pages/user/my_service/tment_details?number=" + number + url: "/packageG/pages/user/my_service/tment_details?number=" + number }); }, 1000); } else { diff --git a/pages/cart/cart2_inte/cart2_inte.js b/packageG/pages/user/my_service/tment_detail.js index aaef95f..b0656d9 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/packageG/pages/user/my_service/tment_detail.js @@ -1,4 +1,4 @@ -// pages/cart/cart2_inte/cart2_inte.js +// packageG/packageG/pages/user/my_service/tment_detail.js Page({ /** diff --git a/pages/cart/cart2_inte/cart2_inte.json b/packageG/pages/user/my_service/tment_detail.json index 8835af0..8835af0 100644 --- a/pages/cart/cart2_inte/cart2_inte.json +++ b/packageG/pages/user/my_service/tment_detail.json diff --git a/packageG/pages/user/my_service/tment_detail.wxml b/packageG/pages/user/my_service/tment_detail.wxml new file mode 100644 index 0000000..36c8f1c --- /dev/null +++ b/packageG/pages/user/my_service/tment_detail.wxml @@ -0,0 +1,2 @@ + +packageG/packageG/pages/user/my_service/tment_detail.wxml diff --git a/packageG/pages/user/my_service/tment_detail.wxss b/packageG/pages/user/my_service/tment_detail.wxss new file mode 100644 index 0000000..73ebf62 --- /dev/null +++ b/packageG/pages/user/my_service/tment_detail.wxss @@ -0,0 +1 @@ +/* packageG/packageG/pages/user/my_service/tment_detail.wxss */ \ No newline at end of file diff --git a/pages/user/my_service/tment_details.js b/packageG/pages/user/my_service/tment_details.js index 1898051..1898051 100644 --- a/pages/user/my_service/tment_details.js +++ b/packageG/pages/user/my_service/tment_details.js diff --git a/pages/user/my_service/tment_details.json b/packageG/pages/user/my_service/tment_details.json index 98e6ad7..98e6ad7 100644 --- a/pages/user/my_service/tment_details.json +++ b/packageG/pages/user/my_service/tment_details.json diff --git a/pages/user/my_service/tment_details.wxml b/packageG/pages/user/my_service/tment_details.wxml index d0a5955..7919b09 100644 --- a/pages/user/my_service/tment_details.wxml +++ b/packageG/pages/user/my_service/tment_details.wxml @@ -104,10 +104,10 @@ 更改时间 - + 发表评价 - + 查看评价 diff --git a/pages/user/my_service/tment_details.wxss b/packageG/pages/user/my_service/tment_details.wxss index d525a6a..d525a6a 100644 --- a/pages/user/my_service/tment_details.wxss +++ b/packageG/pages/user/my_service/tment_details.wxss diff --git a/pages/user/my_service/tment_eval.js b/packageG/pages/user/my_service/tment_eval.js index 00abb22..dddc118 100644 --- a/pages/user/my_service/tment_eval.js +++ b/packageG/pages/user/my_service/tment_eval.js @@ -192,7 +192,7 @@ Page({ var namber=th.data.number; setTimeout(function() { wx.redirectTo({ - url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 + url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 }); }, 2000); } else { diff --git a/pages/user/my_service/tment_eval.json b/packageG/pages/user/my_service/tment_eval.json index 8d44d3f..8d44d3f 100644 --- a/pages/user/my_service/tment_eval.json +++ b/packageG/pages/user/my_service/tment_eval.json diff --git a/pages/user/my_service/tment_eval.wxml b/packageG/pages/user/my_service/tment_eval.wxml index 2a52ff8..2a52ff8 100644 --- a/pages/user/my_service/tment_eval.wxml +++ b/packageG/pages/user/my_service/tment_eval.wxml diff --git a/pages/user/my_service/tment_eval.wxss b/packageG/pages/user/my_service/tment_eval.wxss index 8b0b898..8b0b898 100644 --- a/pages/user/my_service/tment_eval.wxss +++ b/packageG/pages/user/my_service/tment_eval.wxss diff --git a/packageG/pages/user/my_service/tment_order_list.wxml b/packageG/pages/user/my_service/tment_order_list.wxml index 91ed5cf..69c2989 100644 --- a/packageG/pages/user/my_service/tment_order_list.wxml +++ b/packageG/pages/user/my_service/tment_order_list.wxml @@ -23,7 +23,7 @@ - + @@ -68,12 +68,12 @@ 取消预约 - 查看详情 + 查看详情 更改时间 - 发表评价 + 发表评价 重新预约 - 评价详情 + 评价详情 diff --git a/pages/cart/cart2_inte/cart2_inte.wxml b/pages/cart/cart2_inte/cart2_inte.wxml deleted file mode 100644 index f0db95a..0000000 --- a/pages/cart/cart2_inte/cart2_inte.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/cart/cart2_inte/cart2_inte.wxml diff --git a/pages/cart/cart2_inte/cart2_inte.wxss b/pages/cart/cart2_inte/cart2_inte.wxss deleted file mode 100644 index 08a765a..0000000 --- a/pages/cart/cart2_inte/cart2_inte.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/cart/cart2_inte/cart2_inte.wxss */ \ No newline at end of file diff --git a/pages/cart/cart4/cart4.js b/pages/cart/cart4/cart4.js index 44086ab..eb40940 100644 --- a/pages/cart/cart4/cart4.js +++ b/pages/cart/cart4/cart4.js @@ -95,7 +95,7 @@ Page({ }else { wx.redirectTo({ - url: "/pages/payment/payment/payment?order_sn=" + this.data.order.order_sn + "&order_amount=" + this.data.order.order_amount + url: "/packageG/pages/payment/payment/payment?order_sn=" + this.data.order.order_sn + "&order_amount=" + this.data.order.order_amount }); } } diff --git a/pages/user/my_service/hist_service.js b/pages/user/my_service/hist_service.js deleted file mode 100644 index 4365592..0000000 --- a/pages/user/my_service/hist_service.js +++ /dev/null @@ -1,157 +0,0 @@ -var e = getApp(), - a = e.globalData.setting, - os = a, - t = e.request, - d = e.globalData; -Page({ - - /** - * 页面的初始数据 - */ - data: { - iurl: a.imghost, - isPickerShow: false, - isPickerRender: false, - startTime: "", - endTime: "", - pickerConfig: { - endDate: true, - column: "", - dateLimit: true, - initStartTime: "2019-01-01 12:32:44", - initEndTime: "2019-12-01 12:32:44", - limitStartTime: "1917-05-06 12:32:44", - limitEndTime: "2055-05-06 12:32:44" - }, - hist_List: [], //服务项目列表 - is_service_read: 0, - curpage: 1, //当前分页数 - pageSize: 15, //页大小 - total: 0, - ismore: 0, //是否加载完毕 - is_screen: 0, //是否通过筛选来选择历史服务 - is_reset: 0, //是否重复点击 - is_nav: 1, //是否显示导航栏 - }, - pickerShow: function() { - this.setData({ - isPickerShow: true, - isPickerRender: true, - chartHide: true - }); - }, - pickerHide: function() { - var th = this; - th.setData({ - isPickerShow: false, - chartHide: false - }); - }, - //--选择时间-- - setPickerTime: function(val) { - let data = val.detail, - gl_data = getApp().globalData, - th = this; - th.setData({ - startTime: data.startTime, - endTime: data.endTime, - val: 0, - distance: 0, - hist_List: [], - curpage: 1, - is_screen: 1, - is_nav: 1 - }); - th.query_hist(); - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var th = this; - th.query_hist(); - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() {}, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - var th = this; - if (th.data.total <= th.data.pageSize) return false; - if (th.data.ismore) return false; - - wx.showLoading({ - title: '加载中...', - }) - th.query_hist(); - }, - //重置历史服务数据 - his_reset: function() { - var th = this; - var is_reset = th.data.is_reset; - if (is_reset == 0) { - th.setData({ - hist_List: [], - curpage: 1, - is_service_read: 0, - is_screen: 1, - is_reset: 1, - startTime: "", - endTime: "", - is_nav: 1 - }) - th.query_hist(); - } - }, - query_hist: function() { - - var th = this; - var startTime = th.data.startTime.substring(0, 10); //开始 - var endTime = th.data.endTime.substring(0, 10); //结束 - var url = "/api/weshop/marketing/reservation/history/reservation/page"; - getApp().request.promiseGet(url, { - data: { - storeId: a.stoid, - userId: d.user_id, - beginDate: startTime, - endDate: endTime, - page: th.data.curpage, - pageSize: th.data.pageSize - } - }).then(res => { - wx.hideLoading(); - th.setData({ - is_reset: 0 - }) - if (res.data.code == 0) { - th.data.curpage++; - var arr1 = th.data.hist_List; - var arr2 = res.data.data.pageData; - var arr3 = [...arr1, ...arr2]; - var ismore = 0; - if (arr3.length == res.data.total) ismore = 1 - th.setData({ - hist_List: arr3, - total: res.data.data.total, - ismore: ismore, - is_service_read: 1, - }), wx.stopPullDownRefresh(); //停止下拉刷新 - } else { - th.setData({ - is_service_read: 1, - is_screen: 0, - ismore: 1 - }) - if (startTime!="") { - th.setData({ - total:0 - }) - } - } - }) - } -}) \ No newline at end of file diff --git a/pages/user/my_service/hist_service.json b/pages/user/my_service/hist_service.json deleted file mode 100644 index b81e3be..0000000 --- a/pages/user/my_service/hist_service.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "历史预约", - "usingComponents": { - "timePicker": "/components/timePicker/timePicker", - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml deleted file mode 100644 index 1bb31ce..0000000 --- a/pages/user/my_service/hist_service.wxml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - 共使用 - {{total}} - 次服务 - - - - 重置 - - - - 筛选 - - - - - - - - - - - - - {{item.ServiceName==''?'匿名':item.ServiceName}} - - (服务美容师: - - - (预约美容师: - - {{item.BeauticianName}} - ) - - {{item.ArrangeTime}} - - - - - - 未服务 - 更改时间 - - - 已服务 - 已过期 - 已取消 - 已评价 - - - - - - - 到底了 - - - - - - 该时间段无预约记录 - - - - - - - 暂无服务记录 - - - 前往使用 - - - - - - - - \ No newline at end of file diff --git a/pages/user/my_service/hist_service.wxss b/pages/user/my_service/hist_service.wxss deleted file mode 100644 index 71cd3cf..0000000 --- a/pages/user/my_service/hist_service.wxss +++ /dev/null @@ -1,122 +0,0 @@ -page { - height: 100%; -} - -.box { - width: 0px; - height: 0px; - margin-left: 15rpx; - border-top: 11rpx solid rgba(0, 0, 0, 0); - border-right: 10rpx solid rgba(0, 0, 0, 0); - border-left: 10rpx solid rgba(0, 0, 0, 0); - display: inline-block; - margin-bottom: 10rpx; - color: red; - transform: rotate(0deg); - border-bottom: 18rpx solid rgb(153, 153, 153); -} - -.exption { - padding: 0rpx 45rpx; - background-color: rgb(238, 238, 238); - height: 70rpx; - color: rgb(153, 153, 153); - position: fixed; - top:0rpx; - left: 0rpx; - width: 660rpx; -} - -.count { - margin: 0rpx 5rpx; -} - -.Resetfram { - margin-right: 40rpx; -} - -.Reset { - margin-right: 5rpx; -} - -.Resetsub { - width: 30rpx; - height: 30rpx; -} -.items{ - margin-top: 70rpx; -} -.item { - margin: 0rpx 25rpx; - padding: 0rpx 20rpx; - height: 100rpx; - border-bottom: 1rpx solid rgb(242, 242, 242); -} - -.itemName { - margin-right: 10rpx; - max-width: 130rpx; -} - -.itemUsna { - max-width: 150rpx; -} - -.serState { - color: rgb(255, 82, 125); - text-align: right; -} - -.container { - position: fixed; - width: 100%; - top: 0rpx; -} - -/* 无历史服务 */ - -.empty_order { - height: 100%; - background-color: rgb(238, 238, 238); -} - -.empty_order image { - width: 329rpx; - height: 229rpx; - margin-top: 202rpx; -} - -.empty_order .xc-ash { - margin-top: 10rpx; - font-weight: 600px; -} - -.empty_order navigator { - margin-top: 65rpx; - border-radius: 40rpx; -} - -.empty_order navigator view { - width: 247rpx; - height: 65rpx; - background-color: rgb(255, 72, 72); - border-radius: 40rpx; -} - -.After_all { - height: 80rpx; -} - -.After_all .Line { - border-top: 3rpx solid rgb(0, 0, 0); - width: 130rpx; -} - -.After_all .end { - margin: 0rpx 15rpx; -} -.slot{ - color: rgb(153, 153, 153); - height:300rpx; - width:100%; -} \ No newline at end of file diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js index 74d2102..baf0791 100644 --- a/pages/user/my_service/i_service.js +++ b/pages/user/my_service/i_service.js @@ -129,7 +129,7 @@ Page({ "继续使用", function() { my_confirm.open_cancel(0); - var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number; + var deta_url = "/packageG/pages/user/my_service/tment_details?number=" + res.data.data.Number; wx.navigateTo({ url: deta_url }) @@ -214,7 +214,7 @@ Page({ "继续预约", function() { my_confirm.open_cancel(0); - var deta_url = "/pages/user/my_service/tment_details?number=" + number; + var deta_url = "/packageG/pages/user/my_service/tment_details?number=" + number; wx.navigateTo({ url: deta_url })