wxd / MShopWeApp

Commit 29b29ae0b16956f906c66845c25335c6f39e0274

Authored by F5VT98DI7XY4X12\Administrator
1 parent db9e2366

1、评价后原有的界面上的商品图片不显示 (完成) 

2、优惠券使用时间未到但还是能选择得到                            (完成)
3、重新申请退款点击进入无法重新退款                              (完成)
4、基本设置里设置的退款方式是原路返回，在商城使用微信支付，      (完成)
然后申请退款，到退货单里退款的的类型却是退到用户余额。
5、订单详情页面关于退款的显示
Inline Side-by-side
Showing 10 changed files with 208 additions and 25 deletions
pages/order/refund_order/refund_order.js
  View file @29b29ae
... ... @@ -13,15 +13,21 @@ Page({
13 13 back_money: 0,
14 14 reasonSelect: 0,
15 15 reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ],
16   - return_type:0,
  16 + refund_type:0,
17 17 },
18 18 onLoad: function(t) {
19 19 var th=this;
20 20 getApp().getConfig2(function (em) {
21   - th.data.return_type = em.return_type;
  21 +
  22 + console.log('getConfig2');
  23 + console.log(em);
  24 +
  25 + th.data.refund_type = em.refund_type;
22 26 e.getUserInfo(function(e) {
  27 +
23 28 console.log('onload');
24 29 console.log(e);
  30 +
25 31 th.setData({
26 32 orderId: t.order_id,
27 33 user: e,
... ... @@ -67,7 +73,7 @@ Page({
67 73 goods_id_list: glist,
68 74 addtime: ut.gettimestamp(),
69 75 type:2,
70   - return_type: th.data.return_type,
  76 + refund_type: th.data.refund_type,
71 77 },
72 78 success: function (e) {
73 79 wx.showToast({
... ...
pages/team/team_show/team_show.wxml
  View file @29b29ae
... ... @@ -188,7 +188,7 @@
188 188 <image src='{{image}}'></image>
189 189 <view>
190 190 <view>
191   - <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
  191 + <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
192 192 </view>
193 193 <view class="ellipsis-2">
194 194 {{goods.goods_name}}
... ...
pages/user/comment/comment.js
  View file @29b29ae
... ... @@ -47,6 +47,7 @@ Page({
47 47 a.request(n, function (t) {
48 48 e.data.currentPage++;
49 49 var da = th.data.comments;
  50 + /*--
50 51 da.forEach(function(em,ind){
51 52 rq.get("/api/weshop/goods/get/" + os.stoid + "/" + em.goods_id, {
52 53 success: function (tt) {
... ... @@ -55,7 +56,7 @@ Page({
55 56 th.setData({ comments: da, })
56 57 },
57 58 });
58   - })
  59 + })---*/
59 60  
60 61  
61 62 }, null, { store_id: os.stoid, user_id: oo.user_id }),
... ... @@ -64,6 +65,8 @@ Page({
64 65 a.request(n, function(t) {
65 66 e.data.currentPage++;
66 67 var da = th.data.comments;
  68 +
  69 + /*--
67 70 da.forEach(function (em, ind) {
68 71 rq.get("/api/weshop/goods/get/" + os.stoid + "/" + em.goods_id, {
69 72 success: function (tt) {
... ... @@ -72,7 +75,7 @@ Page({
72 75 th.setData({ comments: da, })
73 76 },
74 77 });
75   - });
  78 + });--*/
76 79  
77 80 }, null, {is_comment:t, store_id: os.stoid,user_id: oo.user_id }),
78 81 wx.stopPullDownRefresh();
... ... @@ -96,7 +99,6 @@ Page({
96 99 console.log("comment");
97 100 console.log(a[s]);
98 101  
99   -
100 102 var n = "?order_id=" + a[s].order_id;
101 103 n += "&goods_id=" + a[s].goods_id, n += "&goods_name=" + a[s].goods_name, n += "&price=" + a[s].goods_price,
102 104 n += "&img=" + a[s].original_img,
... ... @@ -110,7 +112,7 @@ Page({
110 112 bind_bnerr2: function (e) {
111 113 var _errImg = e.target.dataset.errorimg;
112 114 var _errObj = {};
113   - _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
  115 + _errObj[_errImg] = this.data.iurl+"/public/images/default_goods_image_240.gif";
114 116 this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
115 117 }
116 118  
... ...
pages/user/comment/comment.wxml
  View file @29b29ae
... ... @@ -10,7 +10,7 @@
10 10 <view class="goods-container" wx:for="{{comments}}" wx:key="{{index}}">
11 11 <view class="goods-box">
12 12 <navigator class="goods-img" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
13   - <image class="wh100" src="{{resourceUrl+item.original_img}}" binderror="bind_bnerr2" lazy-load="true"
  13 + <image class="wh100" src="{{item.original_img}}" binderror="bind_bnerr2" lazy-load="true"
14 14 data-url="{{item.original_img}}" data-errorimg="comments[{{index}}].original_img"></image>
15 15 </navigator>
16 16 <navigator class="goods-desc" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
... ...
pages/user/order_detail/order_detail.js
  View file @29b29ae
1 1 var e = getApp(), r = e.request,rq=r,t = require("../../../utils/util.js"), o = require("../../../utils/common.js"),oo=e.globalData,os=oo.setting;
  2 +var regeneratorRuntime = require('../../../utils/runtime.js');
2 3  
3 4 Page({
4 5 data: {
... ... @@ -52,11 +53,97 @@ Page({
52 53 if (r.order_status == 6)
53 54 r.order_status_detail = "退款完成";
54 55  
  56 + r['is_all_return'] = 0;
  57 +
55 58 //------获取订单商品-------
56 59 rq.get("/api/weshop/ordergoods/list",{
57 60 data: { store_id: os.stoid, order_id: oid},
58   - success: function (eb) {
59   - r.order_goods=eb.data.data.pageData;
  61 + success:async function (eb) {
  62 + r.order_goods=eb.data.data.pageData;
  63 +
  64 + //------------对比一下有没有退款记录------------
  65 + await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
  66 + data: { order_id: r.order_id, store_id: os.stoid,
  67 + user_id:oo.user_id, pageSize: 20 }
  68 + }).then(rs=>{
  69 + var ttd=rs;
  70 + //--看一下订单的总数量--
  71 + var gtype_num = r.order_goods.length;
  72 + if(ttd.data.data.pageData == undefined) return false;
  73 + var goodslist = r.order_goods;
  74 +
  75 + //----没有相关的退款记录----
  76 + if (ttd.data.data.total==0){
  77 + r['is_all_return'] = 0;
  78 + goodslist.forEach(function (ee, ii) {
  79 + if (r['order_status'] == 1 && r['pay_status'] == 1 && gtype_num>1)
  80 + goodslist[ii]['return_btn']=1;
  81 + });
  82 + }else{
  83 + //--------整单退--------
  84 + if (ttd.data.data.pageData[0]['goods_id_list'] != null
  85 + && ttd.data.data.pageData[0]['goods_id_list'] != ''){
  86 + var eea = ttd.data.data.pageData[0];
  87 + //1.退款正在进行中，
  88 + //2.退款被拒绝就要显示可以退款
  89 + //3.退款已经完成
  90 + r['is_all_return']=1;
  91 + r['is_all_return_status'] = ttd.data.data.pageData[0].status;
  92 +
  93 + if (r['order_status'] == 1 && r['pay_status'] == 1) {
  94 + switch (eea.status) {
  95 + case 0:
  96 + case 1:
  97 + r['return_btn'] = 2; break;
  98 + case 2:
  99 + r['return_btn'] = 4; break;
  100 + case 3:
  101 + r['return_btn'] = 3; break;
  102 + default:
  103 + r['return_btn'] = 0;
  104 + }
  105 + }
  106 + }else{
  107 + //1.退款正在进行中，
  108 + //2.退款被拒绝就要显示可以退款
  109 + //3.退款已经完成
  110 + r['is_all_return'] = 0;
  111 + if(r['order_status'] == 1 && r['pay_status'] == 1) {
  112 + goodslist.forEach(function (eeb, iii) {
  113 + goodslist[iii]['return_btn'] = 1;
  114 + ttd.data.data.pageData.forEach(function (eea, ii) {
  115 + var st = eea.status;
  116 + if (eea.goods_id == eeb.goods_id){
  117 + r['has_rt'] = 1; //有部分退
  118 + switch (eea.status){
  119 + case 0:
  120 + case 1://退款处理中
  121 + goodslist[iii]['return_btn'] = 2; break;
  122 + case 2://退款完成
  123 + goodslist[iii]['return_btn'] = 4; break;
  124 + case 3://已拒绝，重新退款
  125 + goodslist[iii]['return_btn'] = 3; break;
  126 + default:
  127 + goodslist[iii]['return_btn'] = 1; //申请退款
  128 + }
  129 + return;
  130 + }
  131 + });
  132 + });
  133 + }
  134 + }
  135 + }
  136 +
  137 + r['order_goods'] = goodslist;
  138 + var g_num = 0;
  139 + goodslist.forEach(function (ee, ii) {
  140 + if(ee.return_btn!=4)
  141 + g_num += ee.goods_num;
  142 + });
  143 + r['g_num'] = g_num;
  144 + })
  145 +
  146 +
60 147 //--------获取门店-----------
61 148 rq.get("/api/weshop/pickup/get/" + os.stoid + "/" + r.pickup_id, {
62 149 success: function (ebb) {
... ... @@ -66,6 +153,8 @@ Page({
66 153 });
67 154 }
68 155 })
  156 +
  157 +
69 158 }
70 159 })
71 160 }
... ... @@ -185,5 +274,52 @@ Page({
185 274 zfwk:function(){
186 275 var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
187 276 getApp().goto(url);
  277 + },
  278 +
  279 + //--------跳转到退款详情-----------
  280 + gotoreturn: function (t) {
  281 + var e = t.currentTarget.dataset.recid;
  282 + var oid = t.currentTarget.dataset.oid;
  283 + var wh = "";
  284 + if (e != undefined && e != null && e != "") {
  285 + wh = "&goods_id=" + e;
188 286 }
  287 + wx.navigateTo({
  288 + url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
  289 + });
  290 + },
  291 +
  292 + //---判断是不是有退款-----
  293 + checkReturnGoodsStatus: function (t) {
  294 + var e = t.currentTarget.dataset.recid;
  295 + var oid = t.currentTarget.dataset.oid;
  296 + r.get("/api/weshop/order/returngoods/page", {
  297 + data: {
  298 + goods_id: e,
  299 + order_id: oid,
  300 + store_id: os.stoid
  301 + },
  302 + success: function (t) {
  303 + if (t.data.code == 0) {
  304 + var r = t.data.data.total;
  305 + if (0 == r) return wx.navigateTo({
  306 + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  307 + });
  308 + //--如果拒绝，就重新申请退款--
  309 + if (t.data.data.pageData[0].status == 3) {
  310 + return wx.navigateTo({
  311 + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  312 + });
  313 + }
  314 +
  315 + wx.navigateTo({
  316 + url: "/pages/user/return_goods_info/return_goods_info?id=" + r
  317 + });
  318 + }
  319 + }
  320 + });
  321 + },
  322 +
  323 +
  324 +
189 325 });
190 326 \ No newline at end of file
... ...
pages/user/order_detail/order_detail.wxml
  View file @29b29ae
... ... @@ -18,26 +18,41 @@
18 18 <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>
19 19 <view>{{order.order_status_detail}}</view>
20 20 </view>
21   - <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}">
  21 + <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}" wx:if="{{item.return_btn!=4}}" >
22 22 <view class="goods-img">
23 23 <image class="wh100" src="{{resourceUrl+item.original_img}}" binderror="bind_bnerr" lazy-load="true"
24 24 data-errorimg="order.order_goods[{{index}}].original_img"></image>
25 25 </view>
  26 +
26 27 <navigator class="order-cont" openType="navigate" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
27 28 <view class="goods-name">{{item.goods_name}}</view>
28 29 <view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>
29 30 </navigator>
  31 +
30 32 <view class="order-num">
31 33 <view class="goods-price">￥{{item.member_goods_price}}</view>
32 34 <view class="goods-num">×{{item.goods_num}}</view>
  35 +
  36 + <!-- 不是整单退的时候 -->
  37 + <block wx:if="{{order.is_all_return!=1}}">
  38 + <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
  39 + data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==1}}">申请退款</view>
  40 + <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
  41 + data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==2}}">退款中</view>
  42 + <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
  43 + data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==3}}">重新退款</view>
  44 + <view bindtap="gotoreturn" class="goods-num" data-oid="{{item.order_id}}"
  45 + data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==4}}">退款完成</view>
  46 + </block>
  47 +
  48 +
33 49 </view>
34 50 </view>
35 51 <view class="order-operate">
36 52 <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
37 53 <view bindtap="contactService" class="contact-us goods-btn">联系客服</view>
38 54 <view bindtap="cancelOrder" class="cancel-order goods-btn" data-id="{{order.order_id}}"
39   - hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>
40   -
  55 + hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>
41 56 </view>
42 57 </view>
43 58 <view class="basic-information information">
... ... @@ -113,9 +128,21 @@
113 128 </view>
114 129  
115 130 <view class="btn-wrap">
  131 +
116 132 <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
117 133 <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
118 134 <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
119 135 <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  136 +
  137 + <!---has_rt部分退---->
  138 + <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
  139 + <navigator class="tips-btn" hidden="{{!(order.order_status==0&&order.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
  140 + <navigator class="tips-btn" hidden="{{!(order.order_status==1&&order.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
  141 + </block>
  142 + <block wx:else>
  143 + <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
  144 + <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
  145 + url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
  146 + </block>
120 147 </view>
121 148 </view>
... ...
pages/user/order_detail/order_detail.wxss
  View file @29b29ae
... ... @@ -46,7 +46,7 @@
46 46 padding: 30rpx 0;
47 47 border-bottom: 1px solid #ddd;
48 48 color: #666;
49   - min-height: 100rpx;
  49 + min-height: 115rpx;
50 50 }
51 51 .goods-img {
52 52 float: left;
... ... @@ -57,7 +57,7 @@
57 57  
58 58 .order-cont {
59 59 float: left;
60   - width: 400rpx;
  60 + width: 410rpx;
61 61 }
62 62  
63 63 .goods-name {
... ...
pages/user/order_list/order_list.js
  View file @29b29ae
... ... @@ -69,6 +69,7 @@ Page({
69 69 }).then(res=>{
70 70 tt=res;
71 71 })
  72 +
72 73 //------------对比一下有没有退款记录------------
73 74 await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
74 75 data: { order_id: item.order_id, store_id: os.stoid,
... ... @@ -140,10 +141,12 @@ Page({
140 141 }
141 142 }
142 143 }
  144 +
143 145 data[ind]['order_goods'] = goodslist;
144 146 var g_num = 0;
145 147 goodslist.forEach(function (ee, ii) {
146   - g_num += ee.goods_num;
  148 + if(ee.return_btn!=4)
  149 + g_num += ee.goods_num;
147 150 });
148 151 data[ind]['g_num'] = g_num;
149 152 })
... ... @@ -261,6 +264,13 @@ Page({
261 264 if (0 == r) return wx.navigateTo({
262 265 url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
263 266 });
  267 + //--如果拒绝，就重新申请退款--
  268 + if (t.data.data.pageData[0].status==3){
  269 + return wx.navigateTo({
  270 + url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
  271 + });
  272 + }
  273 +
264 274 wx.navigateTo({
265 275 url: "/pages/user/return_goods_info/return_goods_info?id=" + r
266 276 });
... ...
pages/user/order_list/order_list.wxml
  View file @29b29ae
... ... @@ -16,7 +16,8 @@
16 16 </view>
17 17 </navigator>
18 18  
19   - <view class="goods-cont" wx:for="{{item.order_goods}}" wx:for-item="goods"
  19 + <view class="goods-cont" wx:for="{{item.order_goods}}" wx:for-item="goods"
  20 + wx:if="{{goods.return_btn!=4}}"
20 21 wx:for-index="pinx"
21 22 wx:key="{{index}}">
22 23 <navigator class="img-box" url="/pages/user/order_detail/order_detail?order_id={{goods.order_id}}">
... ... @@ -37,7 +38,7 @@
37 38 <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
38 39 data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
39 40 <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}"
40   - data-recid="{{goods.goods_id}}" hidden="{{!(goods.return_btn==3)}}">重新退款</view>
  41 + data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
41 42 <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
42 43 data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
43 44 </block>
... ... @@ -83,7 +84,8 @@
83 84 </block>
84 85 <block wx:else>
85 86 <navigator class="order-btn" wx:if="{{item.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
86   - <navigator class="order-btn" wx:if="{{item.is_all_return_status!=3}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
  87 + <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}"
  88 + url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
87 89 </block>
88 90  
89 91  
... ... @@ -91,8 +93,8 @@
91 93 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
92 94 <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
93 95 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
94   - <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
95   -
  96 + <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
  97 + <navigator class="order-btn" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
96 98 </view>
97 99  
98 100 </view>
... ...
pages/user/return_goods/return_goods.js
  View file @29b29ae
... ... @@ -22,13 +22,13 @@ Page({
22 22 checkCauseIndex: -1,
23 23 popState: !0,
24 24 description: "",
25   - return_type:0,
  25 + refund_type:0,
26 26 },
27 27 onLoad: function(e) {
28 28 var a = this;
29 29  
30 30 getApp().getConfig2(function (em) {
31   - a.data.return_type = em.return_type;
  31 + a.data.refund_type = em.refund_type;
32 32 });
33 33  
34 34 this.setData({
... ... @@ -154,7 +154,7 @@ Page({
154 154 goods_id: th.data.order.goods_id,
155 155 addtime: ut.gettimestamp(),
156 156 type:2,
157   - return_type: th.data.return_type,
  157 + refund_type: th.data.refund_type,
158 158 },
159 159 success: function(t) {
160 160 wx.showToast({
... ...