wxd / MShopWeApp

Commit bd670604a4dba49e6d7f7f88a4c652bf7e9d0a90

Authored by 后端研发-苏明海
2 parents a0f27221 adf2db4d

Merge branch 'dev' into 'test' 

Dev

See merge request !24
Inline Side-by-side
Showing 4 changed files with 96 additions and 98 deletions
pages/team/team_show/team_show.wxml
  View file @bd67060
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 <view> 190 <view>
191 <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text> 191 <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
192 </view> 192 </view>
193 - <view class="ellipsis-1"> 193 + <view class="ellipsis-2">
194 {{goods.goods_name}} 194 {{goods.goods_name}}
195 </view> 195 </view>
196 </view> 196 </view>
pages/user/order_detail/order_detail.wxss
  View file @bd67060
@@ -167,5 +167,6 @@ @@ -167,5 +167,6 @@
167 font-size: 30rpx; 167 font-size: 30rpx;
168 color: #fff; 168 color: #fff;
169 background-color: #f23030; 169 background-color: #f23030;
170 - margin-left: 2rpx; 170 + /* margin-left: 2rpx; */
  171 + margin-right: 8rpx
171 } 172 }
172 \ No newline at end of file 173 \ No newline at end of file
pages/user/order_list/order_list.js
  View file @bd67060
@@ -4,6 +4,7 @@ var t = function(t) { @@ -4,6 +4,7 @@ var t = function(t) {
4 }; 4 };
5 }(require("../../../utils/LoadMore.js")), e = getApp(),os=e.globalData.setting,oo=e.globalData, 5 }(require("../../../utils/LoadMore.js")), e = getApp(),os=e.globalData.setting,oo=e.globalData,
6 r = e.request,rq=r, a = require("../../../utils/common.js"), s = new t.default(); 6 r = e.request,rq=r, a = require("../../../utils/common.js"), s = new t.default();
  7 +var regeneratorRuntime = require('../../../utils/runtime.js');
7 8
8 Page({ 9 Page({
9 data: { 10 data: {
@@ -60,102 +61,94 @@ Page({ @@ -60,102 +61,94 @@ Page({
60 s.request(r, function(t) { 61 s.request(r, function(t) {
61 62
62 th.setData({is_get:1}); 63 th.setData({is_get:1});
63 -  
64 var data=e.data.orderList; 64 var data=e.data.orderList;
65 - data.forEach(function (item,ind){  
66 - console.log(item)  
67 - if (item.order_goods==undefined){  
68 - rq.get('/api/weshop/ordergoods/list',{  
69 - isShowLoading:0, 65 + data.forEach(async function (item,ind){
  66 + var tt =null;
  67 + await getApp().request.promiseGet('/api/weshop/ordergoods/list',{
70 data: {order_id: item.order_id, store_id:os.stoid,pageSize:600}, 68 data: {order_id: item.order_id, store_id:os.stoid,pageSize:600},
71 - success: function (tt) {  
72 - //------------对比一下有没有退款记录------------  
73 - rq.get("/api/weshop/order/returngoods/page",{  
74 - isShowLoading: 0,  
75 - data: { order_id: item.order_id, store_id: os.stoid,  
76 - user_id:oo.user_id, pageSize: 20 },  
77 - success: function (ttd) {  
78 - console.log('returngoods');  
79 - var gtype_num = tt.data.data.total;  
80 - if(ttd.data.data.pageData == undefined) return false;  
81 - var goodslist = tt.data.data.pageData;  
82 - //----没有相关的退款记录----  
83 - if (ttd.data.data.total==0){  
84 - data[ind]['is_all_return'] = 0;  
85 - goodslist.forEach(function (ee, ii) {  
86 - if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1 && gtype_num>1)  
87 - goodslist[ii]['return_btn']=1;  
88 - });  
89 - }else{  
90 - //--------整单退--------  
91 - if (ttd.data.data.pageData[0]['goods_id_list'] != null  
92 - && ttd.data.data.pageData[0]['goods_id_list'] != ''){  
93 - var eea = ttd.data.data.pageData[0];  
94 - //1.退款正在进行中，  
95 - //2.退款被拒绝就要显示可以退款  
96 - //3.退款已经完成  
97 - data[ind]['is_all_return']=1;  
98 - data[ind]['is_all_return_status'] = ttd.data.data.pageData[0].status; 69 + }).then(res=>{
  70 + tt=res;
  71 + })
  72 + //------------对比一下有没有退款记录------------
  73 + await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
  74 + data: { order_id: item.order_id, store_id: os.stoid,
  75 + user_id:oo.user_id, pageSize: 20 }
  76 + }).then(rs=>{
  77 + var ttd=rs;
  78 + //--看一下订单的总数量--
  79 + var gtype_num = tt.data.data.total;
  80 + if(ttd.data.data.pageData == undefined) return false;
  81 + var goodslist = tt.data.data.pageData;
  82 + //----没有相关的退款记录----
  83 + if (ttd.data.data.total==0){
  84 + data[ind]['is_all_return'] = 0;
  85 + goodslist.forEach(function (ee, ii) {
  86 + if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1 && gtype_num>1)
  87 + goodslist[ii]['return_btn']=1;
  88 + });
  89 + }else{
  90 + //--------整单退--------
  91 + if (ttd.data.data.pageData[0]['goods_id_list'] != null
  92 + && ttd.data.data.pageData[0]['goods_id_list'] != ''){
  93 + var eea = ttd.data.data.pageData[0];
  94 + //1.退款正在进行中，
  95 + //2.退款被拒绝就要显示可以退款
  96 + //3.退款已经完成
  97 + data[ind]['is_all_return']=1;
  98 + data[ind]['is_all_return_status'] = ttd.data.data.pageData[0].status;
  99 +
  100 + if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
  101 + switch (eea.status) {
  102 + case 0:
  103 + case 1:
  104 + data[ind]['return_btn'] = 2; break;
  105 + case 2:
  106 + data[ind]['return_btn'] = 4; break;
  107 + case 3:
  108 + data[ind]['return_btn'] = 3; break;
  109 + default:
  110 + data[ind]['return_btn'] = 0;
  111 + }
  112 + }
  113 + }else{
  114 + //1.退款正在进行中，
  115 + //2.退款被拒绝就要显示可以退款
  116 + //3.退款已经完成
  117 + data[ind]['is_all_return'] = 0;
  118 + if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
  119 + goodslist.forEach(function (eeb, iii) {
  120 + goodslist[iii]['return_btn'] = 1;
  121 + ttd.data.data.pageData.forEach(function (eea, ii) {
  122 + var st = eea.status;
  123 + if (eea.goods_id == eeb.goods_id){
  124 + data[ind]['has_rt'] = 1; //有部分退
  125 + switch (eea.status){
  126 + case 0:
  127 + case 1://退款处理中
  128 + goodslist[iii]['return_btn'] = 2; break;
  129 + case 2://退款完成
  130 + goodslist[iii]['return_btn'] = 4; break;
  131 + case 3://已拒绝，重新退款
  132 + goodslist[iii]['return_btn'] = 3; break;
  133 + default:
  134 + goodslist[iii]['return_btn'] = 1; //申请退款
  135 + }
  136 + return;
  137 + }
  138 + });
  139 + });
  140 + }
  141 + }
  142 + }
  143 + data[ind]['order_goods'] = goodslist;
  144 + var g_num = 0;
  145 + goodslist.forEach(function (ee, ii) {
  146 + g_num += ee.goods_num;
  147 + });
  148 + data[ind]['g_num'] = g_num;
  149 + })
  150 + th.setData({ orderList: data, });
99 151
100 - if (data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {  
101 -  
102 - switch (eea.status) {  
103 - case 0:  
104 - case 1:  
105 - data[ind]['return_btn'] = 2; break;  
106 - case 2:  
107 - data[ind]['return_btn'] = 2; break;  
108 - case 3:  
109 - data[ind]['return_btn'] = 3; break;  
110 - default:  
111 - data[ind]['return_btn'] = 0;  
112 - }  
113 -  
114 - }  
115 - }else{  
116 - //1.退款正在进行中，  
117 - //2.退款被拒绝就要显示可以退款  
118 - //3.退款已经完成  
119 - data[ind]['is_all_return'] = 0;  
120 - if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {  
121 - ttd.data.data.pageData.forEach(function (eea, ii) {  
122 - goodslist.forEach(function (eeb, iii) {  
123 - var st = eea.status;  
124 -  
125 - if (eea.goods_id == eeb.goods_id){  
126 - data[ind]['has_rt'] = 1; //有部分退  
127 - switch (eea.status){  
128 - case 0:  
129 - case 1://退款处理中  
130 - goodslist[iii]['return_btn'] = 2;break;  
131 -  
132 - case 2://已完成  
133 - goodslist[iii]['return_btn'] = 2; break;  
134 - case 3://已拒绝  
135 - goodslist[iii]['return_btn'] = 3; break;  
136 - default:  
137 - goodslist[iii]['return_btn'] = 1;  
138 - }  
139 - }else{  
140 - goodslist[iii]['return_btn'] =0;  
141 - }  
142 - });  
143 - });  
144 - }  
145 - }  
146 - }  
147 - data[ind]['order_goods'] = goodslist;  
148 - var g_num = 0;  
149 - goodslist.forEach(function (ee, ii) {  
150 - g_num += ee.goods_num;  
151 - });  
152 - data[ind]['g_num'] = g_num;  
153 - th.setData({ orderList: data, });  
154 - }  
155 - })  
156 - }  
157 - })  
158 - }  
159 }); 152 });
160 e.data.currentPage++, 153 e.data.currentPage++,
161 /*--- 154 /*---
pages/user/order_list/order_list.wxml
  View file @bd67060
@@ -29,13 +29,17 @@ @@ -29,13 +29,17 @@
29 <view class="goods-price">¥ {{goods.member_goods_price}}</view> 29 <view class="goods-price">¥ {{goods.member_goods_price}}</view>
30 <view class="goods-num">数量 {{goods.goods_num}}</view> 30 <view class="goods-num">数量 {{goods.goods_num}}</view>
31 </navigator> 31 </navigator>
  32 +
  33 + <!-- 不是整单退的时候 -->
32 <block wx:if="{{item.is_all_return!=1}}"> 34 <block wx:if="{{item.is_all_return!=1}}">
33 <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" 35 <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}"
34 - data-recid="{{goods.goods_id}}" hidden="{{!(goods.return_btn==0)}}">申请退款</view>  
35 - <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"  
36 - data-recid="{{goods.goods_id}}" hidden="{{!(goods.return_btn==2)}}">退款详情</view> 36 + data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1}}">申请退款</view>
37 <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" 37 <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
  38 + data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
  39 + <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}"
38 data-recid="{{goods.goods_id}}" hidden="{{!(goods.return_btn==3)}}">重新退款</view> 40 data-recid="{{goods.goods_id}}" hidden="{{!(goods.return_btn==3)}}">重新退款</view>
  41 + <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
  42 + data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
39 </block> 43 </block>
40 44
41 <block wx:if="{{item.pt_status==1}}"> 45 <block wx:if="{{item.pt_status==1}}">