From e1afc493b7a2602005f368a72bf59fbc439ad279 Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Mon, 18 Dec 2023 16:23:51 +0800 Subject: [PATCH] 移包 --- app.json | 8 ++++---- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml | 6 +++--- packageC/pages/presell/cart/cart.wxml | 6 +++--- packageG/pages/order/refund_order/refund_order.js | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/order/refund_order/refund_order.json | 4 ++++ packageG/pages/order/refund_order/refund_order.wxml | 42 ++++++++++++++++++++++++++++++++++++++++++ packageG/pages/order/refund_order/refund_order.wxss | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/hist_service.js | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/hist_service.json | 7 +++++++ packageG/pages/user/my_service/hist_service.wxml | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageG/pages/user/my_service/hist_service.wxss | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/order/refund_order/refund_order.js | 158 -------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/order/refund_order/refund_order.json | 4 ---- pages/order/refund_order/refund_order.wxml | 42 ------------------------------------------ pages/order/refund_order/refund_order.wxss | 90 ------------------------------------------------------------------------------------------ pages/user/my_service/i_service.wxml | 2 +- pages/user/order_detail/order_detail.wxml | 6 +++--- pages/user/order_list/order_list.wxml | 6 +++--- 18 files changed, 679 insertions(+), 311 deletions(-) create mode 100644 packageG/pages/order/refund_order/refund_order.js create mode 100644 packageG/pages/order/refund_order/refund_order.json create mode 100644 packageG/pages/order/refund_order/refund_order.wxml create mode 100644 packageG/pages/order/refund_order/refund_order.wxss create mode 100644 packageG/pages/user/my_service/hist_service.js create mode 100644 packageG/pages/user/my_service/hist_service.json create mode 100644 packageG/pages/user/my_service/hist_service.wxml create mode 100644 packageG/pages/user/my_service/hist_service.wxss delete mode 100644 pages/order/refund_order/refund_order.js delete mode 100644 pages/order/refund_order/refund_order.json delete mode 100644 pages/order/refund_order/refund_order.wxml delete mode 100644 pages/order/refund_order/refund_order.wxss diff --git a/app.json b/app.json index d6fb2a7..1754969 100644 --- a/app.json +++ b/app.json @@ -6,8 +6,6 @@ "pages/cart/cart4/cart4", "pages/goods/goodsInfo/goodsInfo", "pages/goods/goodsList/goodsList", - - "pages/order/refund_order/refund_order", "pages/payment/payment/payment", "pages/user/index/index", "pages/user/order_list/order_list", @@ -28,7 +26,7 @@ "pages/user/my_service/i_service", - "pages/user/my_service/hist_service", + "pages/user/my_service/tment_details", "pages/user/my_service/tment_eval", @@ -250,7 +248,9 @@ "pages/user/my_service/appment_main", "pages/user/my_service/cosmetology_list", "pages/user/my_service/beauty_deta", - "pages/user/my_service/tment_order_list" + "pages/user/my_service/tment_order_list", + "pages/user/my_service/hist_service", + "pages/order/refund_order/refund_order" ] } ], diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 857ca09..2ae8399 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -191,12 +191,12 @@ - 申请退款 - 申请退款 + 申请退款 + 申请退款 删除订单 - 重新退款 + 重新退款 退款详情 diff --git a/packageG/pages/order/refund_order/refund_order.js b/packageG/pages/order/refund_order/refund_order.js new file mode 100644 index 0000000..266dcc4 --- /dev/null +++ b/packageG/pages/order/refund_order/refund_order.js @@ -0,0 +1,158 @@ +var e = getApp(),oo=e.globalData, t = e.globalData.setting, os=t,a = e.request,rq=a; +var ut = require("../../../utils/util.js"); + +Page({ + data: { + url: t.url, + resourceUrl: t.resourceUrl, + iurl: t.imghost, + user: null, + openReasonModal: !1, + orderId: 0, + order_sn:"", + back_money: 0, + back_integral: 0, + reasonSelect: 0, + reasonList: [ "没有收到货", "不喜欢/不想要", "个人原因拍错/漏拍", "空包裹", "未按照约定时间发货", "快递/物流未送达", "快递/物流无跟踪记录", "发错快递", "商品破损", "商品尺寸规格不符", "商品质量差，与网上描述不符", "其他原因" ], + refund_type:0, + isloading:0, + template_id:[], + }, + onLoad: async function(t) { + var th=this; + getApp().getConfig2(function (em) { + + console.log('getConfig2'); + console.log(em); + + th.data.refund_type = em.refund_type; + e.getUserInfo(function(e) { + + console.log('onload'); + console.log(e); + + th.setData({ + orderId: t.order_id, + user: e, + }), + wx.showLoading(); + rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{ + success:function(ed){ + var bm = ed.data.data.order_amount + ed.data.data.user_money + + ed.data.data.pt_tail_money + th.setData({ + order_sn: ed.data.data.order_sn, + back_money: bm + }) + //如果有积分的话 + if( ed.data.data.integral>0){ + th.setData({back_integral:ed.data.data.integral}); + } + + wx.hideLoading(); + } + }) + }); + }) + try { + let template_id =await getApp().get_template_id('1025') + this.setData({ + template_id + }) + } catch (error) {} + }, + //订阅消息提醒 + sendsm: function (ee) { + let th = this; + var template_id = this.data.template_id; + console.error('退款'); + console.error(template_id); + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: template_id, + success(res) { + th.refundOrder(ee); + }, + fail(res) { + th.refundOrder(ee); + } + }) + }, + //------提交退款申请------- + refundOrder: function(e) { + //if(!this.data.back_money){ + // return false; + //} + if(this.data.isloading) return false; + this.data.isloading=1; + var th = this; + //----获取订单的所有商品----- + rq.get('/api/weshop/ordergoods/list',{ + data: { order_id: th.data.orderId,store_id:os.stoid}, + success:function(od){ + console.log('ordergoods'); + console.log(od); + var glist=""; + var olist=od.data.data.pageData; + /*-- + olist.forEach(function(ie,ind){ + glist+=ie.goods_id+"," + })--*/ + for(var i in olist){ + var ie=olist[i]; + glist+=ie.goods_id+"," + } + + glist = glist.substring(0, glist.length-1); + console.log(glist); + var r_data={ + order_id: th.data.orderId, + order_sn: th.data.order_sn, + store_id:os.stoid, + user_id: th.data.user.user_id, + back_money: th.data.back_money, + reason: th.data.reasonList[th.data.reasonSelect], + goods_id_list: glist, + addtime: ut.gettimestamp(), + type:2, + refund_type: th.data.refund_type, + }; + + if(th.data.back_integral){ + r_data.back_integral=th.data.back_integral; + } + rq.post("/api/weshop/order/returngoods/saveReturnGoods", { + data: r_data, + success: function (e) { + wx.showToast({ + title: "已提交申请", + mask: !0, + duration: 1e3, + complete: function () { + wx.setStorageSync("order:order_list:update", !0), wx.setStorageSync("order:order_detail:update", !0), + setTimeout(function () { + wx.navigateBack(); + }, 1e3); + } + }); + } + }); + } + }) + }, + openReasonModal: function() { + this.setData({ + openReasonModal: !0 + }); + }, + closeReasonModal: function() { + this.setData({ + openReasonModal: !1 + }); + }, + reasonChange: function(e) { + this.setData({ + reasonSelect: e.detail.value + }); + } +}); \ No newline at end of file diff --git a/packageG/pages/order/refund_order/refund_order.json b/packageG/pages/order/refund_order/refund_order.json new file mode 100644 index 0000000..238b2b6 --- /dev/null +++ b/packageG/pages/order/refund_order/refund_order.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "申请退款", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/packageG/pages/order/refund_order/refund_order.wxml b/packageG/pages/order/refund_order/refund_order.wxml new file mode 100644 index 0000000..0b46269 --- /dev/null +++ b/packageG/pages/order/refund_order/refund_order.wxml @@ -0,0 +1,42 @@ + + + 订单号：{{order_sn}} + + 温馨提示： + 1.限时特价、预约资格等购买优惠可能一并取消 + 2.如遇订单拆分、使用优惠券无法返还 + 3.支付金额，抵扣余额积分都按原路退款 + 4.订单一旦取消，无法恢复 + +
+ + 退款原因: + {{reasonList[reasonSelect]}} + + + + + + 联系人: + + + + 手机号码: + + + +
+ + diff --git a/packageG/pages/order/refund_order/refund_order.wxss b/packageG/pages/order/refund_order/refund_order.wxss new file mode 100644 index 0000000..788b3ee --- /dev/null +++ b/packageG/pages/order/refund_order/refund_order.wxss @@ -0,0 +1,90 @@ +.container { + font-size: 28rpx; +} +.top{background: #fff; height: 50rpx; line-height: 50rpx;padding: 0 30rpx;} +.message { + padding: 60rpx 40rpx; + line-height: 40rpx; +} + +.item { + float: left; + padding: 0 30rpx; + width: 100%; + box-sizing: border-box; + border-bottom: 1rpx #f5f5f5 solid; + background-color: white; + line-height: 100rpx; + height: 100rpx; + position: relative; +} + +.item-name { + float: left; +} + +.item-input { + float: left; + height: 100rpx; + width: 450rpx; + margin-left: 20rpx; + word-break: keep-all; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.arrow { + position: absolute; + right: 30rpx; + width: 32rpx; + height: 32rpx; + padding-top: 30rpx; +} + +.submit-btn { + position: fixed; + bottom: 80rpx; + width: 50%; + margin-left: 25%; + font-size: 36rpx; + background-color: #e23435; + color: white; + line-height: 100rpx; +} + +.reason-modal { + z-index: 20; + position: fixed; + bottom: 0; + left: 0; + right: 0; + overflow-y: hidden; + color: #666666; + background-color: white; +} + +.reason-nav { + text-align: center; + font-size: 35rpx; + padding-top: 30rpx; +} + +.reason-list { + padding: 20rpx 30rpx 40rpx; + font-size: 28rpx; +} + +.reason-item { + display: block; + padding: 20rpx 0; +} + +.reason-btn { + width: 100%; + color: white; + background-color: #f23030; + line-height: 90rpx; + text-align: center; + font-size: 40rpx; +} \ No newline at end of file diff --git a/packageG/pages/user/my_service/hist_service.js b/packageG/pages/user/my_service/hist_service.js new file mode 100644 index 0000000..4365592 --- /dev/null +++ b/packageG/pages/user/my_service/hist_service.js @@ -0,0 +1,157 @@ +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/packageG/pages/user/my_service/hist_service.json b/packageG/pages/user/my_service/hist_service.json new file mode 100644 index 0000000..b81e3be --- /dev/null +++ b/packageG/pages/user/my_service/hist_service.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "历史预约", + "usingComponents": { + "timePicker": "/components/timePicker/timePicker", + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageG/pages/user/my_service/hist_service.wxml b/packageG/pages/user/my_service/hist_service.wxml new file mode 100644 index 0000000..1bb31ce --- /dev/null +++ b/packageG/pages/user/my_service/hist_service.wxml @@ -0,0 +1,82 @@ + + + + + 共使用 + {{total}} + 次服务 + + + + 重置 + + + + 筛选 + + + + + + + + + + + + + {{item.ServiceName==''?'匿名':item.ServiceName}} + + (服务美容师： + + + (预约美容师： + + {{item.BeauticianName}} + ) + + {{item.ArrangeTime}} + + + + + + 未服务 + 更改时间 + + + 已服务 + 已过期 + 已取消 + 已评价 + + + + + + + 到底了 + + + + + + 该时间段无预约记录 + + + + + + + 暂无服务记录 + + + 前往使用 + + + + + + + + \ No newline at end of file diff --git a/packageG/pages/user/my_service/hist_service.wxss b/packageG/pages/user/my_service/hist_service.wxss new file mode 100644 index 0000000..71cd3cf --- /dev/null +++ b/packageG/pages/user/my_service/hist_service.wxss @@ -0,0 +1,122 @@ +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/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js deleted file mode 100644 index 266dcc4..0000000 --- a/pages/order/refund_order/refund_order.js +++ /dev/null @@ -1,158 +0,0 @@ -var e = getApp(),oo=e.globalData, t = e.globalData.setting, os=t,a = e.request,rq=a; -var ut = require("../../../utils/util.js"); - -Page({ - data: { - url: t.url, - resourceUrl: t.resourceUrl, - iurl: t.imghost, - user: null, - openReasonModal: !1, - orderId: 0, - order_sn:"", - back_money: 0, - back_integral: 0, - reasonSelect: 0, - reasonList: [ "没有收到货", "不喜欢/不想要", "个人原因拍错/漏拍", "空包裹", "未按照约定时间发货", "快递/物流未送达", "快递/物流无跟踪记录", "发错快递", "商品破损", "商品尺寸规格不符", "商品质量差，与网上描述不符", "其他原因" ], - refund_type:0, - isloading:0, - template_id:[], - }, - onLoad: async function(t) { - var th=this; - getApp().getConfig2(function (em) { - - console.log('getConfig2'); - console.log(em); - - th.data.refund_type = em.refund_type; - e.getUserInfo(function(e) { - - console.log('onload'); - console.log(e); - - th.setData({ - orderId: t.order_id, - user: e, - }), - wx.showLoading(); - rq.get("/api/weshop/order/get/" + os.stoid + "/" + t.order_id,{ - success:function(ed){ - var bm = ed.data.data.order_amount + ed.data.data.user_money - + ed.data.data.pt_tail_money - th.setData({ - order_sn: ed.data.data.order_sn, - back_money: bm - }) - //如果有积分的话 - if( ed.data.data.integral>0){ - th.setData({back_integral:ed.data.data.integral}); - } - - wx.hideLoading(); - } - }) - }); - }) - try { - let template_id =await getApp().get_template_id('1025') - this.setData({ - template_id - }) - } catch (error) {} - }, - //订阅消息提醒 - sendsm: function (ee) { - let th = this; - var template_id = this.data.template_id; - console.error('退款'); - console.error(template_id); - // //授权订阅 - wx.requestSubscribeMessage({ - tmplIds: template_id, - success(res) { - th.refundOrder(ee); - }, - fail(res) { - th.refundOrder(ee); - } - }) - }, - //------提交退款申请------- - refundOrder: function(e) { - //if(!this.data.back_money){ - // return false; - //} - if(this.data.isloading) return false; - this.data.isloading=1; - var th = this; - //----获取订单的所有商品----- - rq.get('/api/weshop/ordergoods/list',{ - data: { order_id: th.data.orderId,store_id:os.stoid}, - success:function(od){ - console.log('ordergoods'); - console.log(od); - var glist=""; - var olist=od.data.data.pageData; - /*-- - olist.forEach(function(ie,ind){ - glist+=ie.goods_id+"," - })--*/ - for(var i in olist){ - var ie=olist[i]; - glist+=ie.goods_id+"," - } - - glist = glist.substring(0, glist.length-1); - console.log(glist); - var r_data={ - order_id: th.data.orderId, - order_sn: th.data.order_sn, - store_id:os.stoid, - user_id: th.data.user.user_id, - back_money: th.data.back_money, - reason: th.data.reasonList[th.data.reasonSelect], - goods_id_list: glist, - addtime: ut.gettimestamp(), - type:2, - refund_type: th.data.refund_type, - }; - - if(th.data.back_integral){ - r_data.back_integral=th.data.back_integral; - } - rq.post("/api/weshop/order/returngoods/saveReturnGoods", { - data: r_data, - success: function (e) { - wx.showToast({ - title: "已提交申请", - mask: !0, - duration: 1e3, - complete: function () { - wx.setStorageSync("order:order_list:update", !0), wx.setStorageSync("order:order_detail:update", !0), - setTimeout(function () { - wx.navigateBack(); - }, 1e3); - } - }); - } - }); - } - }) - }, - openReasonModal: function() { - this.setData({ - openReasonModal: !0 - }); - }, - closeReasonModal: function() { - this.setData({ - openReasonModal: !1 - }); - }, - reasonChange: function(e) { - this.setData({ - reasonSelect: e.detail.value - }); - } -}); \ No newline at end of file diff --git a/pages/order/refund_order/refund_order.json b/pages/order/refund_order/refund_order.json deleted file mode 100644 index 238b2b6..0000000 --- a/pages/order/refund_order/refund_order.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "申请退款", - "enablePullDownRefresh": false -} \ No newline at end of file diff --git a/pages/order/refund_order/refund_order.wxml b/pages/order/refund_order/refund_order.wxml deleted file mode 100644 index 0b46269..0000000 --- a/pages/order/refund_order/refund_order.wxml +++ /dev/null @@ -1,42 +0,0 @@ - - - 订单号：{{order_sn}} - - 温馨提示： - 1.限时特价、预约资格等购买优惠可能一并取消 - 2.如遇订单拆分、使用优惠券无法返还 - 3.支付金额，抵扣余额积分都按原路退款 - 4.订单一旦取消，无法恢复 - -
- - 退款原因: - {{reasonList[reasonSelect]}} - - - - - - 联系人: - - - - 手机号码: - - - -
- - diff --git a/pages/order/refund_order/refund_order.wxss b/pages/order/refund_order/refund_order.wxss deleted file mode 100644 index 788b3ee..0000000 --- a/pages/order/refund_order/refund_order.wxss +++ /dev/null @@ -1,90 +0,0 @@ -.container { - font-size: 28rpx; -} -.top{background: #fff; height: 50rpx; line-height: 50rpx;padding: 0 30rpx;} -.message { - padding: 60rpx 40rpx; - line-height: 40rpx; -} - -.item { - float: left; - padding: 0 30rpx; - width: 100%; - box-sizing: border-box; - border-bottom: 1rpx #f5f5f5 solid; - background-color: white; - line-height: 100rpx; - height: 100rpx; - position: relative; -} - -.item-name { - float: left; -} - -.item-input { - float: left; - height: 100rpx; - width: 450rpx; - margin-left: 20rpx; - word-break: keep-all; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.arrow { - position: absolute; - right: 30rpx; - width: 32rpx; - height: 32rpx; - padding-top: 30rpx; -} - -.submit-btn { - position: fixed; - bottom: 80rpx; - width: 50%; - margin-left: 25%; - font-size: 36rpx; - background-color: #e23435; - color: white; - line-height: 100rpx; -} - -.reason-modal { - z-index: 20; - position: fixed; - bottom: 0; - left: 0; - right: 0; - overflow-y: hidden; - color: #666666; - background-color: white; -} - -.reason-nav { - text-align: center; - font-size: 35rpx; - padding-top: 30rpx; -} - -.reason-list { - padding: 20rpx 30rpx 40rpx; - font-size: 28rpx; -} - -.reason-item { - display: block; - padding: 20rpx 0; -} - -.reason-btn { - width: 100%; - color: white; - background-color: #f23030; - line-height: 90rpx; - text-align: center; - font-size: 40rpx; -} \ No newline at end of file diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index d82ddcc..fb8d5a5 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -5,7 +5,7 @@ 服务记录 - 历史预约 + 历史预约 diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index 32763bb..f741cbc 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -183,12 +183,12 @@ - 申请退款 - 申请退款 + 申请退款 + 申请退款 删除订单 - 重新退款 + 重新退款 退款详情 diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 685581a..252d19e 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -253,12 +253,12 @@ 拼团失败 - 申请退款 - 申请退款 + 申请退款 + 申请退款 删除订单 - 重新退款 + 重新退款 退款详情 -- libgit2 0.21.4