From 2d2231c516fa8591a2db69d5518bb3719b87203c Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Tue, 19 Dec 2023 10:14:50 +0800 Subject: [PATCH] 移包1 --- packageA/pages/my_service/tment_eval.js | 2 +- packageA/pages/my_service/tment_order_list.wxml | 2 +- packageA/pages/my_service2/tment_eval.js | 2 +- packageA/pages/my_service2/tment_order_list.wxml | 2 +- packageG/pages/payment/payment/payment.js | 23 +++++++++++++++++++++++ packageG/pages/payment/payment/payment.json | 4 ++++ packageG/pages/payment/payment/payment.wxml | 14 ++++++++++++++ packageG/pages/payment/payment/payment.wxss | 36 ++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/appment_main.js | 4 ++-- packageG/pages/user/my_service/tment_detail.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_detail.json | 3 +++ packageG/pages/user/my_service/tment_detail.wxml | 2 ++ packageG/pages/user/my_service/tment_detail.wxss | 1 + packageG/pages/user/my_service/tment_details.js | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_details.json | 9 +++++++++ packageG/pages/user/my_service/tment_details.wxml | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_details.wxss | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_eval.js | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_eval.json | 7 +++++++ packageG/pages/user/my_service/tment_eval.wxml | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_eval.wxss | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/tment_order_list.wxml | 8 ++++---- pages/cart/cart2_inte/cart2_inte.js | 66 ------------------------------------------------------------------ pages/cart/cart2_inte/cart2_inte.json | 3 --- pages/cart/cart2_inte/cart2_inte.wxml | 2 -- pages/cart/cart2_inte/cart2_inte.wxss | 1 - pages/cart/cart4/cart4.js | 2 +- pages/payment/payment/payment.js | 23 ----------------------- pages/payment/payment/payment.json | 4 ---- pages/payment/payment/payment.wxml | 14 -------------- pages/payment/payment/payment.wxss | 36 ------------------------------------ pages/user/my_service/hist_service.js | 157 ------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/my_service/hist_service.json | 7 ------- pages/user/my_service/hist_service.wxml | 82 ---------------------------------------------------------------------------------- pages/user/my_service/hist_service.wxss | 122 -------------------------------------------------------------------------------------------------------------------------- pages/user/my_service/i_service.js | 4 ++-- pages/user/my_service/tment_details.js | 148 ---------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/my_service/tment_details.json | 9 --------- pages/user/my_service/tment_details.wxml | 126 ------------------------------------------------------------------------------------------------------------------------------ pages/user/my_service/tment_details.wxss | 118 ---------------------------------------------------------------------------------------------------------------------- pages/user/my_service/tment_eval.js | 287 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/my_service/tment_eval.json | 7 ------- pages/user/my_service/tment_eval.wxml | 105 --------------------------------------------------------------------------------------------------------- pages/user/my_service/tment_eval.wxss | 144 ------------------------------------------------------------------------------------------------------------------------------------------------ 44 files changed, 1106 insertions(+), 1474 deletions(-) create mode 100644 packageG/pages/payment/payment/payment.js create mode 100644 packageG/pages/payment/payment/payment.json create mode 100644 packageG/pages/payment/payment/payment.wxml create mode 100644 packageG/pages/payment/payment/payment.wxss create mode 100644 packageG/pages/user/my_service/tment_detail.js create mode 100644 packageG/pages/user/my_service/tment_detail.json create mode 100644 packageG/pages/user/my_service/tment_detail.wxml create mode 100644 packageG/pages/user/my_service/tment_detail.wxss create mode 100644 packageG/pages/user/my_service/tment_details.js create mode 100644 packageG/pages/user/my_service/tment_details.json create mode 100644 packageG/pages/user/my_service/tment_details.wxml create mode 100644 packageG/pages/user/my_service/tment_details.wxss create mode 100644 packageG/pages/user/my_service/tment_eval.js create mode 100644 packageG/pages/user/my_service/tment_eval.json create mode 100644 packageG/pages/user/my_service/tment_eval.wxml create mode 100644 packageG/pages/user/my_service/tment_eval.wxss delete mode 100644 pages/cart/cart2_inte/cart2_inte.js delete mode 100644 pages/cart/cart2_inte/cart2_inte.json delete mode 100644 pages/cart/cart2_inte/cart2_inte.wxml delete mode 100644 pages/cart/cart2_inte/cart2_inte.wxss delete mode 100644 pages/payment/payment/payment.js delete mode 100644 pages/payment/payment/payment.json delete mode 100644 pages/payment/payment/payment.wxml delete mode 100644 pages/payment/payment/payment.wxss delete mode 100644 pages/user/my_service/hist_service.js delete mode 100644 pages/user/my_service/hist_service.json delete mode 100644 pages/user/my_service/hist_service.wxml delete mode 100644 pages/user/my_service/hist_service.wxss delete mode 100644 pages/user/my_service/tment_details.js delete mode 100644 pages/user/my_service/tment_details.json delete mode 100644 pages/user/my_service/tment_details.wxml delete mode 100644 pages/user/my_service/tment_details.wxss delete mode 100644 pages/user/my_service/tment_eval.js delete mode 100644 pages/user/my_service/tment_eval.json delete mode 100644 pages/user/my_service/tment_eval.wxml delete mode 100644 pages/user/my_service/tment_eval.wxss 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/packageG/pages/payment/payment/payment.js b/packageG/pages/payment/payment/payment.js new file mode 100644 index 0000000..4552b05 --- /dev/null +++ b/packageG/pages/payment/payment/payment.js @@ -0,0 +1,23 @@ +var r = getApp(); + +Page({ + data: { + url: r.globalData.setting.url, + resourceUrl: r.globalData.setting.resourceUrl, + iurl: r.globalData.setting.imghost, + order: null + }, + onLoad: function(r) { + this.setData({ + order: r + }); + }, + lookOrder: function() { + this.data.order.is_group ? wx.redirectTo({ + //url: "/pages/team/team_order/team_order?type=0" + url: "/packageF/pages/team/team_ping/team_ping?type=0" + }) : wx.redirectTo({ + url: "/pages/user/order_list/order_list?type=0" + }); + } +}); \ No newline at end of file diff --git a/packageG/pages/payment/payment/payment.json b/packageG/pages/payment/payment/payment.json new file mode 100644 index 0000000..311144d --- /dev/null +++ b/packageG/pages/payment/payment/payment.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "订单提交成功", + "navigationBarBackgroundColor": "#f5f5f5" +} \ No newline at end of file diff --git a/packageG/pages/payment/payment/payment.wxml b/packageG/pages/payment/payment/payment.wxml new file mode 100644 index 0000000..7b53e88 --- /dev/null +++ b/packageG/pages/payment/payment/payment.wxml @@ -0,0 +1,14 @@ + + + + + + 订单编号 : {{order.order_sn}} + + + 订单金额 : {{order.order_amount}}元 + + 查看订单 + 注意 : 商城平台以及销售商不会以订单异常、系统升级为由要 + 求您点击任何网站链接进行退款操作。 + diff --git a/packageG/pages/payment/payment/payment.wxss b/packageG/pages/payment/payment/payment.wxss new file mode 100644 index 0000000..bab6bda --- /dev/null +++ b/packageG/pages/payment/payment/payment.wxss @@ -0,0 +1,36 @@ +.panel { + background: #fff; +} + +.order-ico { + padding-top: 66rpx; + width: 324rpx; + height: 208rpx; + margin: 0 auto 66rpx; +} + +.pay-way { + font-size: 30rpx; + line-height: 1; + color: #333; + margin-bottom: 30rpx; + text-align: center; +} + +.detail-btn { + display: block; + width: 640rpx; + margin: 60rpx auto 0; + line-height: 72rpx; + border: 1px solid #ddd; + font-size: 32rpx; + color: #333; + text-align: center; +} + +.tips { + padding: 50rpx 55rpx; + font-size: 28rpx; + color: #999; + line-height: 48rpx; +} \ No newline at end of file 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/packageG/pages/user/my_service/tment_detail.js b/packageG/pages/user/my_service/tment_detail.js new file mode 100644 index 0000000..b0656d9 --- /dev/null +++ b/packageG/pages/user/my_service/tment_detail.js @@ -0,0 +1,66 @@ +// packageG/packageG/pages/user/my_service/tment_detail.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_detail.json b/packageG/pages/user/my_service/tment_detail.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageG/pages/user/my_service/tment_detail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file 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/packageG/pages/user/my_service/tment_details.js b/packageG/pages/user/my_service/tment_details.js new file mode 100644 index 0000000..1898051 --- /dev/null +++ b/packageG/pages/user/my_service/tment_details.js @@ -0,0 +1,148 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: a.url, + iurl: a.imghost, + tment_details: [], //预约详情 + number: "", //订单号 + arrangeTime: "", //预约年月日 + day: "", //判断是上午还是下午 + states: 3, //3为取消预约 + }, + //取消预约 + cancel_tment: function(e) { + var th = this; + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "确定取消？", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + var index = e.currentTarget.dataset.index; + var states = th.data.states; + var tment_details = th.data.tment_details; + var number = th.data.number; + var json = { + "number": number, + "storeId": a.stoid, + "states": states + }; + var data = JSON.stringify(json); + var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 + wx.request({ + url: url, + data: data, + method: 'put', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + my_confirm.open_cancel(0); + if (res.data.code == 0) { + getApp().my_warnning("取消成功", 1, th); + var start = 'tment_details[' + 0 + '].State'; + th.setData({ + [start]: 3 + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + } + }) + } + ); + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var th = this; + th.setData({ + number: options.number + }) + + var user=getApp().globalData.userInfo; + if(!user){ + getApp().goto("/packageE/pages/togoin/togoin"); + } + + }, + //查询美容师详情 + query_bea: function() { + var th = this; + var number = th.data.number; + var url = "/api/weshop/marketing/reservation/reservation/page"; + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: d.user_id, + number: number + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + var data = res.data.data.pageData; + var arrangeTime = data[0].ArrangeTime.substring(0, 11); + var day = data[0].ArrangeTime.substring(11, 16); + th.setData({ + tment_details: data, + arrangeTime: arrangeTime, + day: day + }) + + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + }, + //显示核销码 + code_show: function(e) { + var th = this; + //--获取成功的时候-- + var no = e.currentTarget.dataset.order_sn; + var qc_com = th.selectComponent("#qc_com"); //组件的id + var obj = { + val: no, + content: "请将二维码展示给核销员，使用更快捷" + }; + qc_com.open(obj) + }, + //跳到首页 + goto: function(e) { + var th = this; + wx.navigateTo({ + url: '/pages/index/index/index', + }) + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + + var user=getApp().globalData.userInfo; + if(user){ + var th = this; + th.query_bea(); + } + + }, + //关闭导航 + close: function () { + var th = this; + var nav_b = th.selectComponent("#nav_b"); //组件的id + nav_b.close_box(); + } +}) \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_details.json b/packageG/pages/user/my_service/tment_details.json new file mode 100644 index 0000000..98e6ad7 --- /dev/null +++ b/packageG/pages/user/my_service/tment_details.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText": "预约详情", + "usingComponents": { + "qr_code": "/components/qr_code/qr_code", + "warn": "/components/long_warn/long_warn", + "my_confirm": "/components/my_confirm/my_confirm", + "nav_b": "/components/nav_b/nav_b" + } +} \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_details.wxml b/packageG/pages/user/my_service/tment_details.wxml new file mode 100644 index 0000000..7919b09 --- /dev/null +++ b/packageG/pages/user/my_service/tment_details.wxml @@ -0,0 +1,126 @@ + + + + + + 预约状态： + 未服务 + 已服务 + 已过期 + 已取消 + 已评价 + + + + + + + 预约订单: + {{number}} + + + + + + + 预约门店: + {{item.StorageName}} + + + + + 预约项目: + {{item.ServiceName}} + + + + + 预约时间: + {{arrangeTime}} + {{day}} + + + + + + + + + 服务美容师: + + + 预约美容师: + + + {{item.BeauticianName}} + + + + + + 预 + 约 + 人: + + {{item.VIPName}} + + + + + 手 + 机 + 号: + + {{item.MobileTel}} + + + + + + + + + + + + + + 温馨提示 + + 1.预约成功后需在指定时间前到达; + 2.如有任何问题可致电咨询; + 3.如需退约，需提前取消。 + + + + + + 取消预约 + + + 我的服务 + + + + 更改时间 + + + 发表评价 + + + 查看评价 + + + 重新预约 + + + + + + + + + + + + \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_details.wxss b/packageG/pages/user/my_service/tment_details.wxss new file mode 100644 index 0000000..d525a6a --- /dev/null +++ b/packageG/pages/user/my_service/tment_details.wxss @@ -0,0 +1,118 @@ +page { + width: 100%; + background-color: rgb(238, 238, 238); +} + +/* 公用 */ + +.lf { + padding: 0rpx 40rpx; +} + +.bt { + margin: 0rpx 15rpx; + padding: 0rpx 25rpx; + border-top: 2rpx dashed rgb(238, 238, 238); + padding-top: 50rpx; + padding-bottom: 50rpx; +} + +.bmt { + margin-bottom: 35rpx; +} + +.name { + width: 160rpx; + margin-right: 25rpx; +} + +.value { + max-width: 390rpx; +} + +/* 公用 */ + +.container { + padding-bottom:70rpx; +} + +.padding{ + margin: 0rpx 20rpx; +} + +.Subscriber { + overflow: hidden; + margin-top: 25rpx; + background-color: rgb(255, 255, 255); + border-radius: 10rpx; +} + +.statusBar { + height: 80rpx; + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); +} + +.date { + margin-right: 25rpx; +} + +.items { + margin: 40rpx 0rpx; +} + +.Tips { + margin-top: 20rpx; + padding-top: 35rpx; + height: 255rpx; + border-radius: 10rpx; + background-color: rgb(255, 255, 255); + margin-bottom: 50rpx; +} + +.Cozy { + width: 165rpx; + height: 43rpx; + margin-bottom: 20rpx; + color: rgb(255, 255, 255); + background-size: 100%; +} + +.subs { + width: 710rpx; + padding: 15rpx 20rpx; + position: fixed; + bottom:0rpx; + background-color: rgb(255,255,255); +} + +.sub { + width: 325rpx; + height: 65rpx; + border-radius: 30rpx; + color: rgb(255, 255, 255); +} +.code{ + margin-left: 10rpx; + width: 50rpx; + height: 50rpx; +} +.rb { + background-color: rgb(214, 1, 33); +} + +/* 棒槌 */ + +.Stickl { + width: 39rpx; + height: 10rpx; + background-color: rgb(153, 153, 153); + transform: rotate(270deg); + border-radius: 20rpx; + left: 95rpx; + top: -15rpx; +} + +.Stickr { + left: 590rpx; +} diff --git a/packageG/pages/user/my_service/tment_eval.js b/packageG/pages/user/my_service/tment_eval.js new file mode 100644 index 0000000..dddc118 --- /dev/null +++ b/packageG/pages/user/my_service/tment_eval.js @@ -0,0 +1,287 @@ + var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: a.url, //接口网址 + iurl: a.imghost, + defimgurl: "/miniapp/images/no-head.jpg", + stars_index: -1, //当前点击的星星下标 + labels: [], //星级标签数组 + sub_evaluate: 0, //是否评价成功 + proposal: "", //用户输入的建议 + proposal_size: 100, //评价意见和建议限定字数 + number: "", //订单单号 + beautician: "", //美容师信息 + fromType: "服务评价", //评价来源 + arrangeTime: "", //服务日期 + is_evaluate: 0, //是否评价 + EvaluateDatetime: "", //评价时间 + is_act:0, //是否能购获取图片 + actId:0, //活动ID + giftBagId:0, //礼包ID + + }, + //点击星级 + check_stars: function(e) { + var th = this; + var is_evaluate = th.data.is_evaluate; //0可点击 + if (is_evaluate == 0) { + var index = e.currentTarget.dataset.index; + var stars_index = th.data.stars_index; + if (index != stars_index) { + var url = "/api/weshop/marketing/reservation/star/label/list"; + getApp().request.promiseGet(url, { + data: { + Star: index + 1, + storeId: a.stoid + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + labels: res.data.data + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + return; + } + }) + th.setData({ + stars_index: index + }) + } + } + }, + //输入评价意见和建议 + input_proposal: function(e) { + var th = this; + var value = e.detail.value; + th.setData({ + proposal: value + }) + }, + //图片失败，默认图片 + bind_bnerr1: function (e) { + var th = this; + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/no-head.jpg"; + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + //选择标签 + check_label: function(e) { + var th = this; + var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签 + if (evaluate == 0) { + var index = e.currentTarget.dataset.index; + var label_id = th.data.labels[index].check; + var labels = 'labels[' + index + '].check'; + if (label_id) { + label_id = 0 + } else { + label_id = 1 + } + th.setData({ + [labels]: label_id + }) + } + }, + //查询美容师信息 + query_bea: function() { + var th = this; + var url = "/api/weshop/marketing/reservation/reservation/page"; + var number = th.data.number; //订单编号 + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: d.user_id, + number: number + } + }).then(res => { + if (res.data.code == 0) { + var data = res.data.data.pageData; + var arrangeTime = data[0].ArrangeTime; + th.setData({ + beautician: data, + arrangeTime: arrangeTime + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + }, + //获取预约评价 + evaluate_get: function() { + var th = this; + var url = "/api/weshop/evaluation/evaluate/get"; + getApp().request.promiseGet(url, { + data: { + number: th.data.number, + storeId: a.stoid + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + stars_index: res.data.data.Star-1, + labels: res.data.data.EvaluationList, + proposal: res.data.data.Remark, + EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19) + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }) + }, + //提交评价 + evaluate_save: function() { + var th = this; + var stars = th.data.stars_index; //评价星级 + var proposal = th.data.proposal; + //判断是否评级 + if (stars < 0) { + getApp().my_warnning("请进行评分", 0, th); + return false; + } else if (proposal == "") { + getApp().my_warnning("给点建议呗", 0, th); + return false; + } + wx.showLoading({ + title: '加载中', + }) + var labels = th.data.labels; //星级标签数组 + var evaLabList = []; //用户选择的评价标签 + // 查询评价标签 + for (var i = 0; i < labels.length; i++) { + if (labels[i].check) { + evaLabList.push(labels[i].LabelName); + } + } + var url = th.data.url + "/api/weshop/evaluation/evaluate/insert"; + var posNo = th.data.number; //收银单号 + var proposal = th.data.proposal; //用户建议内容 + var fromType = th.data.fromType; //评价来源 + var json = { + "evaLabList": evaLabList, + "fromType": 2, + "number": posNo, + "remark": proposal, + "star": stars + 1, + "storeId": a.stoid + }; + var data = JSON.stringify(json); //转换成json格式 + wx.request({ + url: url, + data: data, + method: 'POST', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + wx.hideLoading(); + if (res.data.code == 0) { + getApp().my_warnning("评价成功", 1, th); + var namber=th.data.number; + setTimeout(function() { + wx.redirectTo({ + url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 + }); + }, 2000); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + } + }) + + }, + //图片失败，默认图片 + bind_bnerr1: function(e) { + var th = this; + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + + var _errObj = {}; + _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg"; + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var th = this; + th.setData({ + number: options.Number, + is_evaluate: options.evaluate + }) + th.query_bea(); + th.judge_act(); + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + var th = this; + var is_evaluate = th.data.is_evaluate; + if (is_evaluate == 1) { + th.evaluate_get(); + } + }, + //评价其他跳转 + evaluate_qt:function(){ + + wx.redirectTo({ + url: "/packageG/pages/user/my_service/tment_order_list?state="+2 + }); + }, + //点击领取礼包 + clike_lb:function(){ + + var id=this.data.actId; + var gifbagid = this.data.gifbagid; + console.log(id,"订单", this.data.number), + wx.redirectTo({ + url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number + }); + + }, + + //--评价有礼判断--- + judge_act: function () { + var th = this; + var url = "/api/weshop/marketing/comment/act/judge"; + getApp().request.promiseGet(url, { + data: { + orderNumber: th.data.number, + orderType: 2, + storeId: a.stoid, + userId: d.user_id + } + }).then(res => { + if (res.data.code == 0) { + var id = res.data.data.id; + var giftbagid = res.data.data.giftbagid; + th.setData({ + is_act: 1, + actId: id, + giftBagId: giftbagid + }) + } else{ + th.setData({ + is_act:0 + }) + } + }) + }, + +}) \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_eval.json b/packageG/pages/user/my_service/tment_eval.json new file mode 100644 index 0000000..8d44d3f --- /dev/null +++ b/packageG/pages/user/my_service/tment_eval.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "预约评价", + "usingComponents": { + "qr_code": "/components/qr_code/qr_code", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_eval.wxml b/packageG/pages/user/my_service/tment_eval.wxml new file mode 100644 index 0000000..2a52ff8 --- /dev/null +++ b/packageG/pages/user/my_service/tment_eval.wxml @@ -0,0 +1,105 @@ + + + + + + + + + + + + 服务美容师： + + {{it.BeauticianName}} + + + + + 服务项目： + {{it.ServiceName}} + + + + + 服务时间： + {{it.WriteTime}} + + + + + 评价时间： + {{EvaluateDatetime}} + + + + + + + + + + + + + + + + + {{proposal}} + + + + + + + {{item.LabelName}} + + + + + + + {{item.LabelName}} + + + + + + + + + + + + + + + + 评价成功 + + + + + + + 确认提交 + + + + + + + 评价其他 + + + + 点击领取礼品 + + + \ No newline at end of file diff --git a/packageG/pages/user/my_service/tment_eval.wxss b/packageG/pages/user/my_service/tment_eval.wxss new file mode 100644 index 0000000..8b0b898 --- /dev/null +++ b/packageG/pages/user/my_service/tment_eval.wxss @@ -0,0 +1,144 @@ +.container { + border-top: 7rpx solid rgb(245, 245, 245); + padding-bottom: 100rpx; + background-color: rgb(255, 255, 255); +} + +.head { + height: 270rpx; +} + +.headimg { + width: 190rpx; + height: 190rpx; + border-radius: 50%; +} + +.item { + margin-bottom: 20rpx; +} + +.itemlf { + width: 195rpx; +} + +.itemlr { + width: 360rpx; +} + +.starss { + margin-top: 15rpx; + border-top: 3rpx dashed rgb(203, 203, 203); + padding-top: 25rpx; + padding-left: 15rpx; +} + +.stars { + width: 50rpx; + height: 50rpx; + margin-right: 20rpx; +} + +.datetime { + width: 190rpx; +} + +.tea_labs { + padding: 0rpx 56rpx; + margin-top: 20rpx; +} + +.proposal { + right: 20rpx; + bottom: 20rpx; + color: rgb(152, 152, 152); +} + +.textarea { + width: 100%; + height: 200rpx; + margin-top: 70rpx; + border: 2rpx solid rgb(203, 203, 203); + border-radius: 13rpx; + padding-top: 25rpx; + padding-left: 30rpx; + margin-bottom: 30rpx; + padding-right: 15rpx; + padding-bottom: 20rpx; +} + +.labels { + display: inline-block; + max-height: 240rxp; + line-height: 50rpx; + padding-left: 15rpx; +} + +.label { + padding: 0rpx 10rpx; + height: 48rpx; + line-height: 48rpx; + border: 2rpx solid rgb(218, 218, 218); + color: rgb(152, 152, 152); + border-radius: 5rpx; + margin-right: 20rpx; + width: 165rpx; + display: inline-block; + text-align: center; + margin-bottom: 10rpx; +} + +/* 选择标签的样式 */ + +.checklabel { + border: 2rpx solid rgb(214, 1, 33); + background-color: rgb(255, 231, 235); + color: rgb(214, 1, 33); +} + +.feedback { + color: rgb(152, 152, 152); + margin-bottom: 70rpx; +} + +.Subs { + background-color: rgb(255, 255, 255); + position: fixed; + width: 100%; + bottom: 40rpx; +} + +.Submission { + width: 400rpx; + height: 65rpx; + border-radius: 60rpx; + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); +} +.Submission.yellow-b{ + background-color: #ffb03f; + +} + +.clonri { + margin: 0rpx; +} + +.subSuccess { + position: fixed; + z-index: 3; + top: 435rpx; + left: 66rpx; + background-color: #a6a6a6a4; + width: 615rpx; + height: 315rpx; + border-radius: 20rpx; + color: rgb(255, 255, 255); +} + +.Success { + width: 110rpx; + height: 110rpx; + margin-top: 50rpx; + margin-bottom: 45rpx; +} 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.js b/pages/cart/cart2_inte/cart2_inte.js deleted file mode 100644 index aaef95f..0000000 --- a/pages/cart/cart2_inte/cart2_inte.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/cart/cart2_inte/cart2_inte.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/cart/cart2_inte/cart2_inte.json b/pages/cart/cart2_inte/cart2_inte.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/cart/cart2_inte/cart2_inte.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file 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/payment/payment/payment.js b/pages/payment/payment/payment.js deleted file mode 100644 index 4552b05..0000000 --- a/pages/payment/payment/payment.js +++ /dev/null @@ -1,23 +0,0 @@ -var r = getApp(); - -Page({ - data: { - url: r.globalData.setting.url, - resourceUrl: r.globalData.setting.resourceUrl, - iurl: r.globalData.setting.imghost, - order: null - }, - onLoad: function(r) { - this.setData({ - order: r - }); - }, - lookOrder: function() { - this.data.order.is_group ? wx.redirectTo({ - //url: "/pages/team/team_order/team_order?type=0" - url: "/packageF/pages/team/team_ping/team_ping?type=0" - }) : wx.redirectTo({ - url: "/pages/user/order_list/order_list?type=0" - }); - } -}); \ No newline at end of file diff --git a/pages/payment/payment/payment.json b/pages/payment/payment/payment.json deleted file mode 100644 index 311144d..0000000 --- a/pages/payment/payment/payment.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "订单提交成功", - "navigationBarBackgroundColor": "#f5f5f5" -} \ No newline at end of file diff --git a/pages/payment/payment/payment.wxml b/pages/payment/payment/payment.wxml deleted file mode 100644 index 7b53e88..0000000 --- a/pages/payment/payment/payment.wxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - 订单编号 : {{order.order_sn}} - - - 订单金额 : {{order.order_amount}}元 - - 查看订单 - 注意 : 商城平台以及销售商不会以订单异常、系统升级为由要 - 求您点击任何网站链接进行退款操作。 - diff --git a/pages/payment/payment/payment.wxss b/pages/payment/payment/payment.wxss deleted file mode 100644 index bab6bda..0000000 --- a/pages/payment/payment/payment.wxss +++ /dev/null @@ -1,36 +0,0 @@ -.panel { - background: #fff; -} - -.order-ico { - padding-top: 66rpx; - width: 324rpx; - height: 208rpx; - margin: 0 auto 66rpx; -} - -.pay-way { - font-size: 30rpx; - line-height: 1; - color: #333; - margin-bottom: 30rpx; - text-align: center; -} - -.detail-btn { - display: block; - width: 640rpx; - margin: 60rpx auto 0; - line-height: 72rpx; - border: 1px solid #ddd; - font-size: 32rpx; - color: #333; - text-align: center; -} - -.tips { - padding: 50rpx 55rpx; - font-size: 28rpx; - color: #999; - line-height: 48rpx; -} \ No newline at end of file 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 }) diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js deleted file mode 100644 index 1898051..0000000 --- a/pages/user/my_service/tment_details.js +++ /dev/null @@ -1,148 +0,0 @@ -var e = getApp(), - a = e.globalData.setting, - os = a, - t = e.request, - d = e.globalData; -Page({ - - /** - * 页面的初始数据 - */ - data: { - url: a.url, - iurl: a.imghost, - tment_details: [], //预约详情 - number: "", //订单号 - arrangeTime: "", //预约年月日 - day: "", //判断是上午还是下午 - states: 3, //3为取消预约 - }, - //取消预约 - cancel_tment: function(e) { - var th = this; - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open( - "确定取消？", - "取消", - "确定", - function() { - my_confirm.open_cancel(0); - }, - function() { - var index = e.currentTarget.dataset.index; - var states = th.data.states; - var tment_details = th.data.tment_details; - var number = th.data.number; - var json = { - "number": number, - "storeId": a.stoid, - "states": states - }; - var data = JSON.stringify(json); - var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 - wx.request({ - url: url, - data: data, - method: 'put', - header: { - 'content-type': 'application/json' - }, // 设置请求的 header - success: function(res) { - my_confirm.open_cancel(0); - if (res.data.code == 0) { - getApp().my_warnning("取消成功", 1, th); - var start = 'tment_details[' + 0 + '].State'; - th.setData({ - [start]: 3 - }) - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - } - }) - } - ); - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var th = this; - th.setData({ - number: options.number - }) - - var user=getApp().globalData.userInfo; - if(!user){ - getApp().goto("/packageE/pages/togoin/togoin"); - } - - }, - //查询美容师详情 - query_bea: function() { - var th = this; - var number = th.data.number; - var url = "/api/weshop/marketing/reservation/reservation/page"; - getApp().request.promiseGet(url, { - data: { - storeId: a.stoid, - userId: d.user_id, - number: number - } - }).then(res => { - wx.hideLoading(); - if (res.data.code == 0) { - var data = res.data.data.pageData; - var arrangeTime = data[0].ArrangeTime.substring(0, 11); - var day = data[0].ArrangeTime.substring(11, 16); - th.setData({ - tment_details: data, - arrangeTime: arrangeTime, - day: day - }) - - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }) - }, - //显示核销码 - code_show: function(e) { - var th = this; - //--获取成功的时候-- - var no = e.currentTarget.dataset.order_sn; - var qc_com = th.selectComponent("#qc_com"); //组件的id - var obj = { - val: no, - content: "请将二维码展示给核销员，使用更快捷" - }; - qc_com.open(obj) - }, - //跳到首页 - goto: function(e) { - var th = this; - wx.navigateTo({ - url: '/pages/index/index/index', - }) - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - - var user=getApp().globalData.userInfo; - if(user){ - var th = this; - th.query_bea(); - } - - }, - //关闭导航 - close: function () { - var th = this; - var nav_b = th.selectComponent("#nav_b"); //组件的id - nav_b.close_box(); - } -}) \ No newline at end of file diff --git a/pages/user/my_service/tment_details.json b/pages/user/my_service/tment_details.json deleted file mode 100644 index 98e6ad7..0000000 --- a/pages/user/my_service/tment_details.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "navigationBarTitleText": "预约详情", - "usingComponents": { - "qr_code": "/components/qr_code/qr_code", - "warn": "/components/long_warn/long_warn", - "my_confirm": "/components/my_confirm/my_confirm", - "nav_b": "/components/nav_b/nav_b" - } -} \ No newline at end of file diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml deleted file mode 100644 index d0a5955..0000000 --- a/pages/user/my_service/tment_details.wxml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - 预约状态： - 未服务 - 已服务 - 已过期 - 已取消 - 已评价 - - - - - - - 预约订单: - {{number}} - - - - - - - 预约门店: - {{item.StorageName}} - - - - - 预约项目: - {{item.ServiceName}} - - - - - 预约时间: - {{arrangeTime}} - {{day}} - - - - - - - - - 服务美容师: - - - 预约美容师: - - - {{item.BeauticianName}} - - - - - - 预 - 约 - 人: - - {{item.VIPName}} - - - - - 手 - 机 - 号: - - {{item.MobileTel}} - - - - - - - - - - - - - - 温馨提示 - - 1.预约成功后需在指定时间前到达; - 2.如有任何问题可致电咨询; - 3.如需退约，需提前取消。 - - - - - - 取消预约 - - - 我的服务 - - - - 更改时间 - - - 发表评价 - - - 查看评价 - - - 重新预约 - - - - - - - - - - - - \ No newline at end of file diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss deleted file mode 100644 index d525a6a..0000000 --- a/pages/user/my_service/tment_details.wxss +++ /dev/null @@ -1,118 +0,0 @@ -page { - width: 100%; - background-color: rgb(238, 238, 238); -} - -/* 公用 */ - -.lf { - padding: 0rpx 40rpx; -} - -.bt { - margin: 0rpx 15rpx; - padding: 0rpx 25rpx; - border-top: 2rpx dashed rgb(238, 238, 238); - padding-top: 50rpx; - padding-bottom: 50rpx; -} - -.bmt { - margin-bottom: 35rpx; -} - -.name { - width: 160rpx; - margin-right: 25rpx; -} - -.value { - max-width: 390rpx; -} - -/* 公用 */ - -.container { - padding-bottom:70rpx; -} - -.padding{ - margin: 0rpx 20rpx; -} - -.Subscriber { - overflow: hidden; - margin-top: 25rpx; - background-color: rgb(255, 255, 255); - border-radius: 10rpx; -} - -.statusBar { - height: 80rpx; - background-color: rgb(214, 1, 33); - color: rgb(255, 255, 255); -} - -.date { - margin-right: 25rpx; -} - -.items { - margin: 40rpx 0rpx; -} - -.Tips { - margin-top: 20rpx; - padding-top: 35rpx; - height: 255rpx; - border-radius: 10rpx; - background-color: rgb(255, 255, 255); - margin-bottom: 50rpx; -} - -.Cozy { - width: 165rpx; - height: 43rpx; - margin-bottom: 20rpx; - color: rgb(255, 255, 255); - background-size: 100%; -} - -.subs { - width: 710rpx; - padding: 15rpx 20rpx; - position: fixed; - bottom:0rpx; - background-color: rgb(255,255,255); -} - -.sub { - width: 325rpx; - height: 65rpx; - border-radius: 30rpx; - color: rgb(255, 255, 255); -} -.code{ - margin-left: 10rpx; - width: 50rpx; - height: 50rpx; -} -.rb { - background-color: rgb(214, 1, 33); -} - -/* 棒槌 */ - -.Stickl { - width: 39rpx; - height: 10rpx; - background-color: rgb(153, 153, 153); - transform: rotate(270deg); - border-radius: 20rpx; - left: 95rpx; - top: -15rpx; -} - -.Stickr { - left: 590rpx; -} diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js deleted file mode 100644 index 00abb22..0000000 --- a/pages/user/my_service/tment_eval.js +++ /dev/null @@ -1,287 +0,0 @@ - var e = getApp(), - a = e.globalData.setting, - os = a, - t = e.request, - d = e.globalData; -Page({ - - /** - * 页面的初始数据 - */ - data: { - url: a.url, //接口网址 - iurl: a.imghost, - defimgurl: "/miniapp/images/no-head.jpg", - stars_index: -1, //当前点击的星星下标 - labels: [], //星级标签数组 - sub_evaluate: 0, //是否评价成功 - proposal: "", //用户输入的建议 - proposal_size: 100, //评价意见和建议限定字数 - number: "", //订单单号 - beautician: "", //美容师信息 - fromType: "服务评价", //评价来源 - arrangeTime: "", //服务日期 - is_evaluate: 0, //是否评价 - EvaluateDatetime: "", //评价时间 - is_act:0, //是否能购获取图片 - actId:0, //活动ID - giftBagId:0, //礼包ID - - }, - //点击星级 - check_stars: function(e) { - var th = this; - var is_evaluate = th.data.is_evaluate; //0可点击 - if (is_evaluate == 0) { - var index = e.currentTarget.dataset.index; - var stars_index = th.data.stars_index; - if (index != stars_index) { - var url = "/api/weshop/marketing/reservation/star/label/list"; - getApp().request.promiseGet(url, { - data: { - Star: index + 1, - storeId: a.stoid - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - labels: res.data.data - }) - } else { - getApp().my_warnning(res.data.msg, 0, th); - return; - } - }) - th.setData({ - stars_index: index - }) - } - } - }, - //输入评价意见和建议 - input_proposal: function(e) { - var th = this; - var value = e.detail.value; - th.setData({ - proposal: value - }) - }, - //图片失败，默认图片 - bind_bnerr1: function (e) { - var th = this; - var _errImg = e.target.dataset.errorimg; - var _Img = e.target.dataset.img; - if (_Img != undefined) { - var _errObj = {}; - _errObj[_errImg] = "/miniapp/images/no-head.jpg"; - th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - } - }, - //选择标签 - check_label: function(e) { - var th = this; - var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签 - if (evaluate == 0) { - var index = e.currentTarget.dataset.index; - var label_id = th.data.labels[index].check; - var labels = 'labels[' + index + '].check'; - if (label_id) { - label_id = 0 - } else { - label_id = 1 - } - th.setData({ - [labels]: label_id - }) - } - }, - //查询美容师信息 - query_bea: function() { - var th = this; - var url = "/api/weshop/marketing/reservation/reservation/page"; - var number = th.data.number; //订单编号 - getApp().request.promiseGet(url, { - data: { - storeId: a.stoid, - userId: d.user_id, - number: number - } - }).then(res => { - if (res.data.code == 0) { - var data = res.data.data.pageData; - var arrangeTime = data[0].ArrangeTime; - th.setData({ - beautician: data, - arrangeTime: arrangeTime - }) - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }) - }, - //获取预约评价 - evaluate_get: function() { - var th = this; - var url = "/api/weshop/evaluation/evaluate/get"; - getApp().request.promiseGet(url, { - data: { - number: th.data.number, - storeId: a.stoid - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - stars_index: res.data.data.Star-1, - labels: res.data.data.EvaluationList, - proposal: res.data.data.Remark, - EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19) - }) - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - }) - }, - //提交评价 - evaluate_save: function() { - var th = this; - var stars = th.data.stars_index; //评价星级 - var proposal = th.data.proposal; - //判断是否评级 - if (stars < 0) { - getApp().my_warnning("请进行评分", 0, th); - return false; - } else if (proposal == "") { - getApp().my_warnning("给点建议呗", 0, th); - return false; - } - wx.showLoading({ - title: '加载中', - }) - var labels = th.data.labels; //星级标签数组 - var evaLabList = []; //用户选择的评价标签 - // 查询评价标签 - for (var i = 0; i < labels.length; i++) { - if (labels[i].check) { - evaLabList.push(labels[i].LabelName); - } - } - var url = th.data.url + "/api/weshop/evaluation/evaluate/insert"; - var posNo = th.data.number; //收银单号 - var proposal = th.data.proposal; //用户建议内容 - var fromType = th.data.fromType; //评价来源 - var json = { - "evaLabList": evaLabList, - "fromType": 2, - "number": posNo, - "remark": proposal, - "star": stars + 1, - "storeId": a.stoid - }; - var data = JSON.stringify(json); //转换成json格式 - wx.request({ - url: url, - data: data, - method: 'POST', - header: { - 'content-type': 'application/json' - }, // 设置请求的 header - success: function(res) { - wx.hideLoading(); - if (res.data.code == 0) { - getApp().my_warnning("评价成功", 1, th); - var namber=th.data.number; - setTimeout(function() { - wx.redirectTo({ - url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1 - }); - }, 2000); - } else { - getApp().my_warnning(res.data.msg, 0, th); - } - } - }) - - }, - //图片失败，默认图片 - bind_bnerr1: function(e) { - var th = this; - var _errImg = e.target.dataset.errorimg; - var _Img = e.target.dataset.img; - if (_Img != undefined) { - - var _errObj = {}; - _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg"; - th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - var th = this; - th.setData({ - number: options.Number, - is_evaluate: options.evaluate - }) - th.query_bea(); - th.judge_act(); - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - var th = this; - var is_evaluate = th.data.is_evaluate; - if (is_evaluate == 1) { - th.evaluate_get(); - } - }, - //评价其他跳转 - evaluate_qt:function(){ - - wx.redirectTo({ - url: "/packageG/pages/user/my_service/tment_order_list?state="+2 - }); - }, - //点击领取礼包 - clike_lb:function(){ - - var id=this.data.actId; - var gifbagid = this.data.gifbagid; - console.log(id,"订单", this.data.number), - wx.redirectTo({ - url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number - }); - - }, - - //--评价有礼判断--- - judge_act: function () { - var th = this; - var url = "/api/weshop/marketing/comment/act/judge"; - getApp().request.promiseGet(url, { - data: { - orderNumber: th.data.number, - orderType: 2, - storeId: a.stoid, - userId: d.user_id - } - }).then(res => { - if (res.data.code == 0) { - var id = res.data.data.id; - var giftbagid = res.data.data.giftbagid; - th.setData({ - is_act: 1, - actId: id, - giftBagId: giftbagid - }) - } else{ - th.setData({ - is_act:0 - }) - } - }) - }, - -}) \ No newline at end of file diff --git a/pages/user/my_service/tment_eval.json b/pages/user/my_service/tment_eval.json deleted file mode 100644 index 8d44d3f..0000000 --- a/pages/user/my_service/tment_eval.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "预约评价", - "usingComponents": { - "qr_code": "/components/qr_code/qr_code", - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml deleted file mode 100644 index 2a52ff8..0000000 --- a/pages/user/my_service/tment_eval.wxml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - 服务美容师： - - {{it.BeauticianName}} - - - - - 服务项目： - {{it.ServiceName}} - - - - - 服务时间： - {{it.WriteTime}} - - - - - 评价时间： - {{EvaluateDatetime}} - - - - - - - - - - - - - - - - - {{proposal}} - - - - - - - {{item.LabelName}} - - - - - - - {{item.LabelName}} - - - - - - - - - - - - - - - - 评价成功 - - - - - - - 确认提交 - - - - - - - 评价其他 - - - - 点击领取礼品 - - - \ No newline at end of file diff --git a/pages/user/my_service/tment_eval.wxss b/pages/user/my_service/tment_eval.wxss deleted file mode 100644 index 8b0b898..0000000 --- a/pages/user/my_service/tment_eval.wxss +++ /dev/null @@ -1,144 +0,0 @@ -.container { - border-top: 7rpx solid rgb(245, 245, 245); - padding-bottom: 100rpx; - background-color: rgb(255, 255, 255); -} - -.head { - height: 270rpx; -} - -.headimg { - width: 190rpx; - height: 190rpx; - border-radius: 50%; -} - -.item { - margin-bottom: 20rpx; -} - -.itemlf { - width: 195rpx; -} - -.itemlr { - width: 360rpx; -} - -.starss { - margin-top: 15rpx; - border-top: 3rpx dashed rgb(203, 203, 203); - padding-top: 25rpx; - padding-left: 15rpx; -} - -.stars { - width: 50rpx; - height: 50rpx; - margin-right: 20rpx; -} - -.datetime { - width: 190rpx; -} - -.tea_labs { - padding: 0rpx 56rpx; - margin-top: 20rpx; -} - -.proposal { - right: 20rpx; - bottom: 20rpx; - color: rgb(152, 152, 152); -} - -.textarea { - width: 100%; - height: 200rpx; - margin-top: 70rpx; - border: 2rpx solid rgb(203, 203, 203); - border-radius: 13rpx; - padding-top: 25rpx; - padding-left: 30rpx; - margin-bottom: 30rpx; - padding-right: 15rpx; - padding-bottom: 20rpx; -} - -.labels { - display: inline-block; - max-height: 240rxp; - line-height: 50rpx; - padding-left: 15rpx; -} - -.label { - padding: 0rpx 10rpx; - height: 48rpx; - line-height: 48rpx; - border: 2rpx solid rgb(218, 218, 218); - color: rgb(152, 152, 152); - border-radius: 5rpx; - margin-right: 20rpx; - width: 165rpx; - display: inline-block; - text-align: center; - margin-bottom: 10rpx; -} - -/* 选择标签的样式 */ - -.checklabel { - border: 2rpx solid rgb(214, 1, 33); - background-color: rgb(255, 231, 235); - color: rgb(214, 1, 33); -} - -.feedback { - color: rgb(152, 152, 152); - margin-bottom: 70rpx; -} - -.Subs { - background-color: rgb(255, 255, 255); - position: fixed; - width: 100%; - bottom: 40rpx; -} - -.Submission { - width: 400rpx; - height: 65rpx; - border-radius: 60rpx; - background-color: rgb(214, 1, 33); - color: rgb(255, 255, 255); -} -.Submission.yellow-b{ - background-color: #ffb03f; - -} - -.clonri { - margin: 0rpx; -} - -.subSuccess { - position: fixed; - z-index: 3; - top: 435rpx; - left: 66rpx; - background-color: #a6a6a6a4; - width: 615rpx; - height: 315rpx; - border-radius: 20rpx; - color: rgb(255, 255, 255); -} - -.Success { - width: 110rpx; - height: 110rpx; - margin-top: 50rpx; - margin-bottom: 45rpx; -} -- libgit2 0.21.4