Merge branch 'test' into 'qa'

Test See merge request !27

Merge branch 'test' into 'qa'
Test See merge request !27
后端研发-苏明海
2 parents b756021c 58212124
Showing 12 changed files with 218 additions and 30 deletions
pages/index/index/index.wxss
pages/order/refund_order/refund_order.js
pages/team/team_show/team_show.wxml
pages/user/comment/comment.js
pages/user/comment/comment.wxml
pages/user/index/index.wxml
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
pages/user/order_detail/order_detail.wxss
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
pages/user/return_goods/return_goods.js
@@ -294,3 +294,8 @@ swiper-item image {
 .arrow-right{width: 30rpx; height: 30rpx;}
 .pd-view{height: 80rpx;}
+
+.xc-grow-ups{
+margin-left:8rpx;
+margin-top:6rpx;
+}
@@ -13,15 +13,21 @@ Page({
         back_money: 0,
         reasonSelect: 0,
         reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ],
-        return_type:0,
+        refund_type:0,
     },
     onLoad: function(t) {
        var th=this;
        getApp().getConfig2(function (em) {
-          th.data.return_type = em.return_type; 
+
+          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,
@@ -67,7 +73,7 @@ Page({
                     goods_id_list: glist,
                     addtime: ut.gettimestamp(),
                     type:2,
-                    return_type: th.data.return_type,
+                    refund_type: th.data.refund_type,
                  },
                  success: function (e) {
                    wx.showToast({
@@ -188,7 +188,7 @@
         <image src='{{image}}'></image>
         <view>
            <view>
-            <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
+            <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text>
            </view> 
            <view class="ellipsis-2">
                {{goods.goods_name}}
@@ -47,6 +47,7 @@ Page({
             a.request(n, function (t) {
               e.data.currentPage++;
               var da = th.data.comments;
+              /*--
               da.forEach(function(em,ind){
                 rq.get("/api/weshop/goods/get/" + os.stoid + "/" + em.goods_id, {
                     success: function (tt) {
@@ -55,7 +56,7 @@ Page({
                       th.setData({ comments: da, })
                     },
                 });
-              })
+              })---*/
             }, null, { store_id: os.stoid, user_id: oo.user_id }),
@@ -64,6 +65,8 @@ Page({
             a.request(n, function(t) {
               e.data.currentPage++;
               var da = th.data.comments;
+
+              /*--
               da.forEach(function (em, ind) {
                 rq.get("/api/weshop/goods/get/" + os.stoid + "/" + em.goods_id, {
                   success: function (tt) {
@@ -72,7 +75,7 @@ Page({
                     th.setData({ comments: da, })
                   },
                 });
-              });
+              });--*/
             }, null, {is_comment:t, store_id: os.stoid,user_id: oo.user_id }),
               wx.stopPullDownRefresh();
@@ -96,7 +99,6 @@ Page({
             console.log("comment");
             console.log(a[s]);
-
             var n = "?order_id=" + a[s].order_id;
             n += "&goods_id=" + a[s].goods_id, n += "&goods_name=" + a[s].goods_name, n += "&price=" + a[s].goods_price, 
               n += "&img=" + a[s].original_img, 
@@ -110,7 +112,7 @@ Page({
     bind_bnerr2: function (e) {
       var _errImg = e.target.dataset.errorimg;
       var _errObj = {};
-      _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+      _errObj[_errImg] = this.data.iurl+"/public/images/default_goods_image_240.gif";
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
    }
@@ -10,7 +10,7 @@
     <view class="goods-container" wx:for="{{comments}}" wx:key="{{index}}">
         <view class="goods-box">
             <navigator class="goods-img" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-                <image class="wh100" src="{{resourceUrl+item.original_img}}" binderror="bind_bnerr2" lazy-load="true"
+                <image class="wh100" src="{{item.original_img}}" binderror="bind_bnerr2" lazy-load="true"
                  data-url="{{item.original_img}}" data-errorimg="comments[{{index}}].original_img"></image>
             </navigator>
             <navigator class="goods-desc" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
@@ -9,9 +9,9 @@
 						   src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
 					<view class="xc-uesr-name">
 						{{userInfo.nickname}} <view class="hvip" wx:if='{{GradeName && is_init}}'><image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view>
-						<view class="flex" style="font-size: 24rpx; margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
+						<view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
 							<block wx:if="{{cz_val<full_cz_val}}">
-						   {{"   "}}<text class="grow-up-val">成长值</text> <view style='margin-left:5rpx; margin-top:-4rpx;'>{{cz_val}} / {{need_money}}</view> 
+						   {{"   "}}<text class="grow-up-val">成长值</text> <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view> 
 							</block>
 							<block wx:else>
 								{{"   "}}<text class="grow-up-val">成长值</text> {{cz_val}}
@@ -105,7 +105,7 @@
 		<view class="xc-equity-title flex-level" bindtap="go_qy">
 			<view class="xc-title-frame flex-space-between">
 				<view class="flex-vertical xc-title-content"> 
-				<image class="xc-title-img" src="../../../images/medal.png"></image>
+				<image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
 				 <view class="three-level-word" >
 					 我的权益
 				 </view>
@@ -167,7 +167,7 @@
 					<view class="fs26">秒杀活动</view>
 				</view>
 				<view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
-					<image class="xc-center-img " src="/images/quanyi2.png"></image>
+					<image class="xc-center-img " src="{{iurl}}/miniapp/images/quanyi2.png"></image>
 					<view class="fs26">我的权益</view>
 				</view>
@@ -188,7 +188,7 @@
 				</view>
         	<view class="item t-c" data-url="/pages/user/address_list/address_list" bindtap="goto" >
-					<image class="xc-center-img " src="/images/add2.png"></image>
+					<image class="xc-center-img " src="{{iurl}}/miniapp/images/add2.png"></image>
 					<view class="four-level-word">我的地址</view>
 				</view>
 var e = getApp(), r = e.request,rq=r,t = require("../../../utils/util.js"), o = require("../../../utils/common.js"),oo=e.globalData,os=oo.setting;
+var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
     data: {
@@ -52,11 +53,97 @@ Page({
                 if (r.order_status == 6)
                   r.order_status_detail = "退款完成";
+              r['is_all_return'] = 0;
+
                //------获取订单商品-------
                rq.get("/api/weshop/ordergoods/list",{
                     data: { store_id: os.stoid, order_id: oid},
-                    success: function (eb) {
-                      r.order_goods=eb.data.data.pageData;
+                    success:async function (eb) {
+                          r.order_goods=eb.data.data.pageData;
+
+                          //------------对比一下有没有退款记录------------
+                          await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
+                              data: { order_id: r.order_id, store_id: os.stoid,
+                                  user_id:oo.user_id, pageSize: 20 }
+                          }).then(rs=>{
+                              var ttd=rs;
+                              //--看一下订单的总数量--
+                              var gtype_num = r.order_goods.length;
+                              if(ttd.data.data.pageData == undefined) return false;
+                              var goodslist = r.order_goods;
+
+                              //----没有相关的退款记录----
+                              if (ttd.data.data.total==0){
+                                  r['is_all_return'] = 0;
+                                  goodslist.forEach(function (ee, ii) {
+                                      if (r['order_status'] == 1 && r['pay_status'] == 1 && gtype_num>1)
+                                          goodslist[ii]['return_btn']=1;
+                                  });
+                              }else{
+                                  //--------整单退--------
+                                  if (ttd.data.data.pageData[0]['goods_id_list'] != null
+                                      && ttd.data.data.pageData[0]['goods_id_list'] != ''){
+                                      var eea = ttd.data.data.pageData[0];
+                                      //1.退款正在进行中，
+                                      //2.退款被拒绝就要显示可以退款
+                                      //3.退款已经完成
+                                      r['is_all_return']=1;
+                                      r['is_all_return_status'] = ttd.data.data.pageData[0].status;
+
+                                      if (r['order_status'] == 1 && r['pay_status'] == 1) {
+                                          switch (eea.status) {
+                                              case 0:
+                                              case 1:
+                                                  r['return_btn'] = 2; break;
+                                              case 2:
+                                                  r['return_btn'] = 4; break;
+                                              case 3:
+                                                  r['return_btn'] = 3; break;
+                                              default:
+                                                  r['return_btn'] = 0;
+                                          }
+                                      }
+                                  }else{
+                                      //1.退款正在进行中，
+                                      //2.退款被拒绝就要显示可以退款
+                                      //3.退款已经完成
+                                      r['is_all_return'] = 0;
+                                      if(r['order_status'] == 1 && r['pay_status'] == 1) {
+                                          goodslist.forEach(function (eeb, iii) {
+                                              goodslist[iii]['return_btn'] = 1;
+                                              ttd.data.data.pageData.forEach(function (eea, ii) {
+                                                  var st = eea.status;
+                                                  if (eea.goods_id == eeb.goods_id){
+                                                      r['has_rt'] = 1; //有部分退
+                                                      switch (eea.status){
+                                                          case 0:
+                                                          case 1://退款处理中
+                                                              goodslist[iii]['return_btn'] = 2; break;
+                                                          case 2://退款完成
+                                                              goodslist[iii]['return_btn'] = 4; break;
+                                                          case 3://已拒绝，重新退款
+                                                              goodslist[iii]['return_btn'] = 3; break;
+                                                          default:
+                                                              goodslist[iii]['return_btn'] = 1; //申请退款
+                                                      }
+                                                      return;
+                                                  }
+                                              });
+                                          });
+                                      }
+                                  }
+                              }
+
+                              r['order_goods'] = goodslist;
+                              var g_num = 0;
+                              goodslist.forEach(function (ee, ii) {
+                                  if(ee.return_btn!=4)
+                                     g_num += ee.goods_num;
+                              });
+                              r['g_num'] = g_num;
+                          })
+
+
                       //--------获取门店-----------
                       rq.get("/api/weshop/pickup/get/" + os.stoid + "/" + r.pickup_id, {
                            success: function (ebb) {
@@ -66,6 +153,8 @@ Page({
                                 });
                            }
                       })
+
+
                     }
                 })               
             }
@@ -185,5 +274,52 @@ Page({
     zfwk:function(){
       var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
       getApp().goto(url);
+    },
+
+  //--------跳转到退款详情-----------
+  gotoreturn: function (t) {
+    var e = t.currentTarget.dataset.recid;
+    var oid = t.currentTarget.dataset.oid;
+    var wh = "";
+    if (e != undefined && e != null && e != "") {
+      wh = "&goods_id=" + e;
     }
+    wx.navigateTo({
+      url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh,
+    });
+  },
+
+  //---判断是不是有退款-----
+  checkReturnGoodsStatus: function (t) {
+    var e = t.currentTarget.dataset.recid;
+    var oid = t.currentTarget.dataset.oid;
+    r.get("/api/weshop/order/returngoods/page", {
+      data: {
+        goods_id: e,
+        order_id: oid,
+        store_id: os.stoid
+      },
+      success: function (t) {
+        if (t.data.code == 0) {
+          var r = t.data.data.total;
+          if (0 == r) return wx.navigateTo({
+            url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
+          });
+          //--如果拒绝，就重新申请退款--
+          if (t.data.data.pageData[0].status == 3) {
+            return wx.navigateTo({
+              url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
+            });
+          }
+
+          wx.navigateTo({
+            url: "/pages/user/return_goods_info/return_goods_info?id=" + r
+          });
+        }
+      }
+    });
+  },
+
+
+
 });
 \ No newline at end of file
@@ -18,26 +18,41 @@
         <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>    
              <view>{{order.order_status_detail}}</view>
         </view>
-        <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}">
+        <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}"  wx:if="{{item.return_btn!=4}}"  >
             <view class="goods-img">
                 <image class="wh100" src="{{resourceUrl+item.original_img}}"  binderror="bind_bnerr" lazy-load="true"
                         data-errorimg="order.order_goods[{{index}}].original_img"></image>
             </view>
+
             <navigator class="order-cont" openType="navigate" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
                 <view class="goods-name">{{item.goods_name}}</view>
                 <view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>
             </navigator>
+
             <view class="order-num">
                 <view class="goods-price">￥{{item.member_goods_price}}</view>
                 <view class="goods-num">×{{item.goods_num}}</view>
+
+                <!-- 不是整单退的时候 -->
+                <block wx:if="{{order.is_all_return!=1}}">
+                    <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
+                          data-recid="{{item.goods_id}}"  wx:if="{{item.return_btn==1}}">申请退款</view>
+                    <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
+                          data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==2}}">退款中</view>
+                    <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
+                          data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==3}}">重新退款</view>
+                    <view bindtap="gotoreturn" class="goods-num" data-oid="{{item.order_id}}"
+                          data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==4}}">退款完成</view>
+                </block>
+
+
             </view>
         </view>
         <view class="order-operate">
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
             <view bindtap="contactService" class="contact-us goods-btn">联系客服</view>
             <view bindtap="cancelOrder" class="cancel-order goods-btn" data-id="{{order.order_id}}" 
-              hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>
-         
+              hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>       
         </view>
     </view>
     <view class="basic-information information">
@@ -113,9 +128,21 @@
     </view>
     <view class="btn-wrap">
+
         <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
         <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
         <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
         <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+
+          <!---has_rt部分退---->
+         <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
+                          <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>
+                          <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>
+         </block> 
+         <block wx:else>
+                          <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>
+                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
+                                     url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
+        </block>
     </view>
 </view>
@@ -46,7 +46,7 @@
     padding: 30rpx 0;
     border-bottom: 1px solid #ddd;
     color: #666;
-    min-height: 100rpx;
+    min-height: 115rpx;
 }
 .goods-img {
     float: left;
@@ -57,7 +57,7 @@
 .order-cont {
     float: left;
-    width: 400rpx;
+    width: 410rpx;
 }
 .goods-name {
@@ -69,6 +69,7 @@ Page({
                        }).then(res=>{
                            tt=res;
                        })
+
                        //------------对比一下有没有退款记录------------
                        await getApp().request.promiseGet("/api/weshop/order/returngoods/page",{
                            data: { order_id: item.order_id, store_id: os.stoid,
@@ -140,10 +141,12 @@ Page({
                                        }
                                    }
                                }
+                               
                                data[ind]['order_goods'] = goodslist;
                                var g_num = 0;
                                goodslist.forEach(function (ee, ii) {
-                                   g_num += ee.goods_num;
+                                   if(ee.return_btn!=4)
+                                      g_num += ee.goods_num;
                                });
                                data[ind]['g_num'] = g_num;
                       })
@@ -261,6 +264,13 @@ Page({
                     if (0 == r) return wx.navigateTo({
                       url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
                     });
+                    //--如果拒绝，就重新申请退款--
+                    if (t.data.data.pageData[0].status==3){
+                       return wx.navigateTo({
+                          url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid,
+                       });
+                    }
+
                     wx.navigateTo({
                       url: "/pages/user/return_goods_info/return_goods_info?id=" + r
                     });
@@ -16,7 +16,8 @@
               </view>
             </navigator>
-            <view class="goods-cont" wx:for="{{item.order_goods}}" wx:for-item="goods"
+            <view class="goods-cont" wx:for="{{item.order_goods}}" wx:for-item="goods" 
+                wx:if="{{goods.return_btn!=4}}"  
                 wx:for-index="pinx"
                 wx:key="{{index}}">
                 <navigator class="img-box" url="/pages/user/order_detail/order_detail?order_id={{goods.order_id}}">
@@ -37,7 +38,7 @@
                   <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
                        data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
                   <view bindtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}"
-                       data-recid="{{goods.goods_id}}" hidden="{{!(goods.return_btn==3)}}">重新退款</view>
+                       data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
                   <view bindtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}"
                           data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
                </block>
@@ -83,7 +84,8 @@
                       </block> 
                       <block wx:else>
                           <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>                          
-                          <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>
+                          <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}"
+                                     url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
                       </block>
@@ -91,8 +93,8 @@
                      <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>
                     <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
                     <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>
-                     <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>
-
+                    <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>
+                    <navigator class="order-btn"  url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
                 </view>
         </view>
@@ -22,13 +22,13 @@ Page({
         checkCauseIndex: -1,
         popState: !0,
         description: "",
-        return_type:0,
+        refund_type:0,
     },
     onLoad: function(e) {
         var a = this;
         getApp().getConfig2(function (em) {
-           a.data.return_type = em.return_type; 
+           a.data.refund_type = em.refund_type;
         });
         this.setData({
@@ -154,7 +154,7 @@ Page({
                       goods_id: th.data.order.goods_id,
                       addtime: ut.gettimestamp(),
                       type:2,
-                      return_type: th.data.return_type,
+                      refund_type: th.data.refund_type,
                     },
                     success: function(t) {
                         wx.showToast({