Commit e1afc493b7a2602005f368a72bf59fbc439ad279
1 parent
f5c8ab23
移包
Showing
14 changed files
with
385 additions
and
17 deletions
app.json
| ... | ... | @@ -6,8 +6,6 @@ |
| 6 | 6 | "pages/cart/cart4/cart4", |
| 7 | 7 | "pages/goods/goodsInfo/goodsInfo", |
| 8 | 8 | "pages/goods/goodsList/goodsList", |
| 9 | - | |
| 10 | - "pages/order/refund_order/refund_order", | |
| 11 | 9 | "pages/payment/payment/payment", |
| 12 | 10 | "pages/user/index/index", |
| 13 | 11 | "pages/user/order_list/order_list", |
| ... | ... | @@ -28,7 +26,7 @@ |
| 28 | 26 | |
| 29 | 27 | "pages/user/my_service/i_service", |
| 30 | 28 | |
| 31 | - "pages/user/my_service/hist_service", | |
| 29 | + | |
| 32 | 30 | "pages/user/my_service/tment_details", |
| 33 | 31 | "pages/user/my_service/tment_eval", |
| 34 | 32 | |
| ... | ... | @@ -250,7 +248,9 @@ |
| 250 | 248 | "pages/user/my_service/appment_main", |
| 251 | 249 | "pages/user/my_service/cosmetology_list", |
| 252 | 250 | "pages/user/my_service/beauty_deta", |
| 253 | - "pages/user/my_service/tment_order_list" | |
| 251 | + "pages/user/my_service/tment_order_list", | |
| 252 | + "pages/user/my_service/hist_service", | |
| 253 | + "pages/order/refund_order/refund_order" | |
| 254 | 254 | ] |
| 255 | 255 | } |
| 256 | 256 | ], | ... | ... |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
| ... | ... | @@ -191,12 +191,12 @@ |
| 191 | 191 | |
| 192 | 192 | <!---has_rt部分退----> |
| 193 | 193 | <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}"> |
| 194 | - <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 195 | - <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 194 | + <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 195 | + <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 196 | 196 | </block> |
| 197 | 197 | <block wx:else> |
| 198 | 198 | <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 199 | - <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | |
| 199 | + <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | |
| 200 | 200 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 201 | 201 | url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 202 | 202 | ... | ... |
packageC/pages/presell/cart/cart.wxml
| ... | ... | @@ -416,12 +416,12 @@ |
| 416 | 416 | |
| 417 | 417 | <!-- 服务卡项的不能申请退款 --> |
| 418 | 418 | <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && !is_fwk}}"> |
| 419 | - <navigator class="tips-btn2" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 420 | - <navigator class="tips-btn2" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 419 | + <navigator class="tips-btn2" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 420 | + <navigator class="tips-btn2" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 421 | 421 | </block> |
| 422 | 422 | <block wx:else> |
| 423 | 423 | <view class="tips-btn2" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 424 | - <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | |
| 424 | + <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | |
| 425 | 425 | <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 426 | 426 | url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 427 | 427 | </block> | ... | ... |
pages/order/refund_order/refund_order.js renamed to packageG/pages/order/refund_order/refund_order.js
pages/order/refund_order/refund_order.json renamed to packageG/pages/order/refund_order/refund_order.json
pages/order/refund_order/refund_order.wxml renamed to packageG/pages/order/refund_order/refund_order.wxml
pages/order/refund_order/refund_order.wxss renamed to packageG/pages/order/refund_order/refund_order.wxss
packageG/pages/user/my_service/hist_service.js
0 → 100644
| 1 | +var e = getApp(), | |
| 2 | + a = e.globalData.setting, | |
| 3 | + os = a, | |
| 4 | + t = e.request, | |
| 5 | + d = e.globalData; | |
| 6 | +Page({ | |
| 7 | + | |
| 8 | + /** | |
| 9 | + * 页面的初始数据 | |
| 10 | + */ | |
| 11 | + data: { | |
| 12 | + iurl: a.imghost, | |
| 13 | + isPickerShow: false, | |
| 14 | + isPickerRender: false, | |
| 15 | + startTime: "", | |
| 16 | + endTime: "", | |
| 17 | + pickerConfig: { | |
| 18 | + endDate: true, | |
| 19 | + column: "", | |
| 20 | + dateLimit: true, | |
| 21 | + initStartTime: "2019-01-01 12:32:44", | |
| 22 | + initEndTime: "2019-12-01 12:32:44", | |
| 23 | + limitStartTime: "1917-05-06 12:32:44", | |
| 24 | + limitEndTime: "2055-05-06 12:32:44" | |
| 25 | + }, | |
| 26 | + hist_List: [], //服务项目列表 | |
| 27 | + is_service_read: 0, | |
| 28 | + curpage: 1, //当前分页数 | |
| 29 | + pageSize: 15, //页大小 | |
| 30 | + total: 0, | |
| 31 | + ismore: 0, //是否加载完毕 | |
| 32 | + is_screen: 0, //是否通过筛选来选择历史服务 | |
| 33 | + is_reset: 0, //是否重复点击 | |
| 34 | + is_nav: 1, //是否显示导航栏 | |
| 35 | + }, | |
| 36 | + pickerShow: function() { | |
| 37 | + this.setData({ | |
| 38 | + isPickerShow: true, | |
| 39 | + isPickerRender: true, | |
| 40 | + chartHide: true | |
| 41 | + }); | |
| 42 | + }, | |
| 43 | + pickerHide: function() { | |
| 44 | + var th = this; | |
| 45 | + th.setData({ | |
| 46 | + isPickerShow: false, | |
| 47 | + chartHide: false | |
| 48 | + }); | |
| 49 | + }, | |
| 50 | + //--选择时间-- | |
| 51 | + setPickerTime: function(val) { | |
| 52 | + let data = val.detail, | |
| 53 | + gl_data = getApp().globalData, | |
| 54 | + th = this; | |
| 55 | + th.setData({ | |
| 56 | + startTime: data.startTime, | |
| 57 | + endTime: data.endTime, | |
| 58 | + val: 0, | |
| 59 | + distance: 0, | |
| 60 | + hist_List: [], | |
| 61 | + curpage: 1, | |
| 62 | + is_screen: 1, | |
| 63 | + is_nav: 1 | |
| 64 | + }); | |
| 65 | + th.query_hist(); | |
| 66 | + }, | |
| 67 | + /** | |
| 68 | + * 生命周期函数--监听页面加载 | |
| 69 | + */ | |
| 70 | + onLoad: function(options) { | |
| 71 | + var th = this; | |
| 72 | + th.query_hist(); | |
| 73 | + }, | |
| 74 | + /** | |
| 75 | + * 生命周期函数--监听页面显示 | |
| 76 | + */ | |
| 77 | + onShow: function() {}, | |
| 78 | + | |
| 79 | + /** | |
| 80 | + * 页面上拉触底事件的处理函数 | |
| 81 | + */ | |
| 82 | + onReachBottom: function() { | |
| 83 | + var th = this; | |
| 84 | + if (th.data.total <= th.data.pageSize) return false; | |
| 85 | + if (th.data.ismore) return false; | |
| 86 | + | |
| 87 | + wx.showLoading({ | |
| 88 | + title: '加载中...', | |
| 89 | + }) | |
| 90 | + th.query_hist(); | |
| 91 | + }, | |
| 92 | + //重置历史服务数据 | |
| 93 | + his_reset: function() { | |
| 94 | + var th = this; | |
| 95 | + var is_reset = th.data.is_reset; | |
| 96 | + if (is_reset == 0) { | |
| 97 | + th.setData({ | |
| 98 | + hist_List: [], | |
| 99 | + curpage: 1, | |
| 100 | + is_service_read: 0, | |
| 101 | + is_screen: 1, | |
| 102 | + is_reset: 1, | |
| 103 | + startTime: "", | |
| 104 | + endTime: "", | |
| 105 | + is_nav: 1 | |
| 106 | + }) | |
| 107 | + th.query_hist(); | |
| 108 | + } | |
| 109 | + }, | |
| 110 | + query_hist: function() { | |
| 111 | + | |
| 112 | + var th = this; | |
| 113 | + var startTime = th.data.startTime.substring(0, 10); //开始 | |
| 114 | + var endTime = th.data.endTime.substring(0, 10); //结束 | |
| 115 | + var url = "/api/weshop/marketing/reservation/history/reservation/page"; | |
| 116 | + getApp().request.promiseGet(url, { | |
| 117 | + data: { | |
| 118 | + storeId: a.stoid, | |
| 119 | + userId: d.user_id, | |
| 120 | + beginDate: startTime, | |
| 121 | + endDate: endTime, | |
| 122 | + page: th.data.curpage, | |
| 123 | + pageSize: th.data.pageSize | |
| 124 | + } | |
| 125 | + }).then(res => { | |
| 126 | + wx.hideLoading(); | |
| 127 | + th.setData({ | |
| 128 | + is_reset: 0 | |
| 129 | + }) | |
| 130 | + if (res.data.code == 0) { | |
| 131 | + th.data.curpage++; | |
| 132 | + var arr1 = th.data.hist_List; | |
| 133 | + var arr2 = res.data.data.pageData; | |
| 134 | + var arr3 = [...arr1, ...arr2]; | |
| 135 | + var ismore = 0; | |
| 136 | + if (arr3.length == res.data.total) ismore = 1 | |
| 137 | + th.setData({ | |
| 138 | + hist_List: arr3, | |
| 139 | + total: res.data.data.total, | |
| 140 | + ismore: ismore, | |
| 141 | + is_service_read: 1, | |
| 142 | + }), wx.stopPullDownRefresh(); //停止下拉刷新 | |
| 143 | + } else { | |
| 144 | + th.setData({ | |
| 145 | + is_service_read: 1, | |
| 146 | + is_screen: 0, | |
| 147 | + ismore: 1 | |
| 148 | + }) | |
| 149 | + if (startTime!="") { | |
| 150 | + th.setData({ | |
| 151 | + total:0 | |
| 152 | + }) | |
| 153 | + } | |
| 154 | + } | |
| 155 | + }) | |
| 156 | + } | |
| 157 | +}) | |
| 0 | 158 | \ No newline at end of file | ... | ... |
packageG/pages/user/my_service/hist_service.json
0 → 100644
packageG/pages/user/my_service/hist_service.wxml
0 → 100644
| 1 | +<view class="{{isPickerRender==true?'container':''}}"> | |
| 2 | + <!-- 点击方法 --> | |
| 3 | + <view class="exption flex-vertical-between fs28" wx:if="{{is_nav || hist_List.length>0}}"> | |
| 4 | + <view class="flex"> | |
| 5 | + 共使用 | |
| 6 | + <view class="count">{{total}}</view> | |
| 7 | + 次服务 | |
| 8 | + </view> | |
| 9 | + <view class="flex"> | |
| 10 | + <view class="Resetfram flex-center" bindtap="his_reset"> | |
| 11 | + <view class="Reset">重置</view> | |
| 12 | + <image class="Resetsub" src="{{iurl}}/miniapp/images/reset.png"></image> | |
| 13 | + </view> | |
| 14 | + <view class="flex-center" bindtap='pickerShow'> | |
| 15 | + <view>筛选</view> | |
| 16 | + <view wx:if="{{true}}" class="box"></view> | |
| 17 | + </view> | |
| 18 | + </view> | |
| 19 | + </view> | |
| 20 | + | |
| 21 | + <!-- 总的服务列表 --> | |
| 22 | + <view class="items"> | |
| 23 | + <!-- 单个 --> | |
| 24 | + <view class="item flex-vertical-between" wx:for="{{hist_List}}"> | |
| 25 | + <!-- left --> | |
| 26 | + <view> | |
| 27 | + <view class="flex fs28"> | |
| 28 | + <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view> | |
| 29 | + <block wx:if="{{item.State==1 || item.State==4}}"> | |
| 30 | + <view>(服务美容师:</view> | |
| 31 | + </block> | |
| 32 | + <block wx:else> | |
| 33 | + <view>(预约美容师:</view> | |
| 34 | + </block> | |
| 35 | + <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view> | |
| 36 | + ) | |
| 37 | + </view> | |
| 38 | + <view class="fs24">{{item.ArrangeTime}}</view> | |
| 39 | + </view> | |
| 40 | + <!-- right --> | |
| 41 | + <view class="serState fs32"> | |
| 42 | + <view wx:if="{{item.State==0}}" > | |
| 43 | + <navigator url="/packageG/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}"> | |
| 44 | + <view>未服务</view> | |
| 45 | + <view>更改时间</view> | |
| 46 | + </navigator> | |
| 47 | + </view> | |
| 48 | + <view wx:if="{{item.State==1}}">已服务</view> | |
| 49 | + <view wx:if="{{item.State==2}}">已过期</view> | |
| 50 | + <view wx:if="{{item.State==3}}">已取消</view> | |
| 51 | + <view wx:if="{{item.State==4}}">已评价</view> | |
| 52 | + </view> | |
| 53 | + </view> | |
| 54 | + <!-- 没有数据 --> | |
| 55 | + <!-- 加载完毕并且数据大于=页大小 --> | |
| 56 | + <view class="After_all flex-center" wx:if="{{ismore && hist_List.length>=pageSize}}"> | |
| 57 | + <view class="Line"></view> | |
| 58 | + <view class="end fs26 xc-black">到底了</view> | |
| 59 | + <view class="Line"></view> | |
| 60 | + </view> | |
| 61 | + </view> | |
| 62 | +</view> | |
| 63 | +<view wx:if="{{hist_List.length<1 && startTime!=''}}" class="flex-center fs26 slot"> | |
| 64 | + <view>该时间段无预约记录</view> | |
| 65 | +</view> | |
| 66 | +<!-- 无历史服务 --> | |
| 67 | +<view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read && startTime==''}}"> | |
| 68 | + <view class="flex-level"> | |
| 69 | + <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image> | |
| 70 | + </view> | |
| 71 | + <view class="flex-level fs30 xc-ash">暂无服务记录</view> | |
| 72 | + <view class="flex-level"> | |
| 73 | + <navigator url="/pages/user/my_service/i_service"> | |
| 74 | + <view class="flex-center fs32 white">前往使用</view> | |
| 75 | + </navigator> | |
| 76 | + </view> | |
| 77 | +</view> | |
| 78 | + | |
| 79 | + | |
| 80 | +<!-- 引用时间主键 --> | |
| 81 | +<timePicker pickerShow="{{isPickerShow}}" id="picker" wx:if="{{isPickerRender}}" bind:hidePicker="pickerHide" bind:setPickerTime="setPickerTime" config="{{pickerConfig}}"></timePicker> | |
| 82 | +<warn id="warn"></warn> | |
| 0 | 83 | \ No newline at end of file | ... | ... |
packageG/pages/user/my_service/hist_service.wxss
0 → 100644
| 1 | +page { | |
| 2 | + height: 100%; | |
| 3 | +} | |
| 4 | + | |
| 5 | +.box { | |
| 6 | + width: 0px; | |
| 7 | + height: 0px; | |
| 8 | + margin-left: 15rpx; | |
| 9 | + border-top: 11rpx solid rgba(0, 0, 0, 0); | |
| 10 | + border-right: 10rpx solid rgba(0, 0, 0, 0); | |
| 11 | + border-left: 10rpx solid rgba(0, 0, 0, 0); | |
| 12 | + display: inline-block; | |
| 13 | + margin-bottom: 10rpx; | |
| 14 | + color: red; | |
| 15 | + transform: rotate(0deg); | |
| 16 | + border-bottom: 18rpx solid rgb(153, 153, 153); | |
| 17 | +} | |
| 18 | + | |
| 19 | +.exption { | |
| 20 | + padding: 0rpx 45rpx; | |
| 21 | + background-color: rgb(238, 238, 238); | |
| 22 | + height: 70rpx; | |
| 23 | + color: rgb(153, 153, 153); | |
| 24 | + position: fixed; | |
| 25 | + top:0rpx; | |
| 26 | + left: 0rpx; | |
| 27 | + width: 660rpx; | |
| 28 | +} | |
| 29 | + | |
| 30 | +.count { | |
| 31 | + margin: 0rpx 5rpx; | |
| 32 | +} | |
| 33 | + | |
| 34 | +.Resetfram { | |
| 35 | + margin-right: 40rpx; | |
| 36 | +} | |
| 37 | + | |
| 38 | +.Reset { | |
| 39 | + margin-right: 5rpx; | |
| 40 | +} | |
| 41 | + | |
| 42 | +.Resetsub { | |
| 43 | + width: 30rpx; | |
| 44 | + height: 30rpx; | |
| 45 | +} | |
| 46 | +.items{ | |
| 47 | + margin-top: 70rpx; | |
| 48 | +} | |
| 49 | +.item { | |
| 50 | + margin: 0rpx 25rpx; | |
| 51 | + padding: 0rpx 20rpx; | |
| 52 | + height: 100rpx; | |
| 53 | + border-bottom: 1rpx solid rgb(242, 242, 242); | |
| 54 | +} | |
| 55 | + | |
| 56 | +.itemName { | |
| 57 | + margin-right: 10rpx; | |
| 58 | + max-width: 130rpx; | |
| 59 | +} | |
| 60 | + | |
| 61 | +.itemUsna { | |
| 62 | + max-width: 150rpx; | |
| 63 | +} | |
| 64 | + | |
| 65 | +.serState { | |
| 66 | + color: rgb(255, 82, 125); | |
| 67 | + text-align: right; | |
| 68 | +} | |
| 69 | + | |
| 70 | +.container { | |
| 71 | + position: fixed; | |
| 72 | + width: 100%; | |
| 73 | + top: 0rpx; | |
| 74 | +} | |
| 75 | + | |
| 76 | +/* 无历史服务 */ | |
| 77 | + | |
| 78 | +.empty_order { | |
| 79 | + height: 100%; | |
| 80 | + background-color: rgb(238, 238, 238); | |
| 81 | +} | |
| 82 | + | |
| 83 | +.empty_order image { | |
| 84 | + width: 329rpx; | |
| 85 | + height: 229rpx; | |
| 86 | + margin-top: 202rpx; | |
| 87 | +} | |
| 88 | + | |
| 89 | +.empty_order .xc-ash { | |
| 90 | + margin-top: 10rpx; | |
| 91 | + font-weight: 600px; | |
| 92 | +} | |
| 93 | + | |
| 94 | +.empty_order navigator { | |
| 95 | + margin-top: 65rpx; | |
| 96 | + border-radius: 40rpx; | |
| 97 | +} | |
| 98 | + | |
| 99 | +.empty_order navigator view { | |
| 100 | + width: 247rpx; | |
| 101 | + height: 65rpx; | |
| 102 | + background-color: rgb(255, 72, 72); | |
| 103 | + border-radius: 40rpx; | |
| 104 | +} | |
| 105 | + | |
| 106 | +.After_all { | |
| 107 | + height: 80rpx; | |
| 108 | +} | |
| 109 | + | |
| 110 | +.After_all .Line { | |
| 111 | + border-top: 3rpx solid rgb(0, 0, 0); | |
| 112 | + width: 130rpx; | |
| 113 | +} | |
| 114 | + | |
| 115 | +.After_all .end { | |
| 116 | + margin: 0rpx 15rpx; | |
| 117 | +} | |
| 118 | +.slot{ | |
| 119 | + color: rgb(153, 153, 153); | |
| 120 | + height:300rpx; | |
| 121 | + width:100%; | |
| 122 | +} | |
| 0 | 123 | \ No newline at end of file | ... | ... |
pages/user/my_service/i_service.wxml
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/> |
| 6 | 6 | <view class="flex jc_sb pd20"> |
| 7 | 7 | <navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator> |
| 8 | - <navigator class="fs26 white" url="/pages/user/my_service/hist_service">历史预约</navigator> | |
| 8 | + <navigator class="fs26 white" url="/packageG/pages/user/my_service/hist_service">历史预约</navigator> | |
| 9 | 9 | </view> |
| 10 | 10 | </view> |
| 11 | 11 | ... | ... |
pages/user/order_detail/order_detail.wxml
| ... | ... | @@ -183,12 +183,12 @@ |
| 183 | 183 | |
| 184 | 184 | <!---has_rt部分退----> |
| 185 | 185 | <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}"> |
| 186 | - <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 187 | - <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 186 | + <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 187 | + <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator> | |
| 188 | 188 | </block> |
| 189 | 189 | <block wx:else> |
| 190 | 190 | <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 191 | - <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | |
| 191 | + <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | |
| 192 | 192 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 193 | 193 | url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 194 | 194 | </block> | ... | ... |
pages/user/order_list/order_list.wxml
| ... | ... | @@ -253,12 +253,12 @@ |
| 253 | 253 | <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view> |
| 254 | 254 | <!---has_rt部分退----> |
| 255 | 255 | <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1 && !(item.order_goods[0].prom_type==9)}}"> |
| 256 | - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator> | |
| 257 | - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator> | |
| 256 | + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator> | |
| 257 | + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator> | |
| 258 | 258 | </block> |
| 259 | 259 | <block wx:else> |
| 260 | 260 | <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2 && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view> |
| 261 | - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator> | |
| 261 | + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator> | |
| 262 | 262 | <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator> |
| 263 | 263 | </block> |
| 264 | 264 | ... | ... |