Merge branch 'dev' into 'test'

Dev See merge request !22

Merge branch 'dev' into 'test'
Dev See merge request !22
后端研发-苏明海
2 parents 3ec3b63f b131abf8
Showing 10 changed files with 87 additions and 58 deletions
pages/goods/categoryList/categoryList.js
pages/order/refund_order/refund_order.js
pages/team/team_ping/team_ping.wxml
pages/team/team_ping/team_ping.wxss
pages/team/team_show/team_show.wxml
pages/user/add_comment/add_comment.js
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.wxml
pages/user/order_list/order_list.wxss
pages/user/return_goods/return_goods.js
@@ -94,7 +94,7 @@ Page({
     requestFirstCategoris: function() {
         var t = this;
         e.get("/api/weshop/goodscategory/page", {
-            data: { store_id: oo.stoid,pageSize:600},
+            data: { store_id: oo.stoid,pageSize:600,is_show:1},
             success: function(e) {   
                 var arr=new Array();
                 var dda = e.data.data.pageData;
@@ -12,28 +12,32 @@ Page({
         order_sn:"",
         back_money: 0,
         reasonSelect: 0,
-        reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ]
+        reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ],
+        return_type:0,
     },
     onLoad: function(t) {
-        var th = this;
-        e.getUserInfo(function(e) {
-            console.log('onload');
-            console.log(e);
-            th.setData({
-                orderId: t.order_id,
-                user: e
-            }), 
-            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
-                  })
-                }
-            })
-        });
+       var th=this;
+       getApp().getConfig2(function (em) {
+          th.data.return_type = em.return_type; 
+          e.getUserInfo(function(e) {
+              console.log('onload');
+              console.log(e);
+              th.setData({
+                  orderId: t.order_id,
+                  user: e,
+              }), 
+              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
+                    })
+                  }
+              })
+          });
+       })
     },
     //------提交退款申请-------
@@ -63,6 +67,7 @@ Page({
                     goods_id_list: glist,
                     addtime: ut.gettimestamp(),
                     type:2,
+                    return_type: th.data.return_type,
                  },
                  success: function (e) {
                    wx.showToast({
@@ -33,20 +33,9 @@
       <view class="flex">
       <text  class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
         <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
-        <view class="flex  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价：</text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].market_price}}</text> </view>
+        <view class="flex  word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">￥</text><text class="fs26  xc-wc">{{item.order_goods[0].market_price}}</text> </view>
 </view>
-        <view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}">   
-           <block wx:if="{{item.ct_num-item.tx.length>0}}">     
-             还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团
-           </block>  
-            <block wx:elif="{{item.max_ct_num-item.tx.length>0}}">     
-                还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最低价
-            </block>  
-            <block wx:else>     
-                您已经可以享受最低价
-            </block>  
-
-       </view>
+      
    <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">
    <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
    </view>
@@ -54,15 +43,27 @@
     <image src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image></view>
         </view>
+<view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}">   
+           <block wx:if="{{item.ct_num-item.tx.length>0}}">     
+             还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团
+           </block>  
+            <block wx:elif="{{item.max_ct_num-item.tx.length>0}}">     
+                还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最价</block>  
+            <block wx:else>您已经可以享受最低价</block>  
+       </view>
+
+
         </view>
+         
     </view>
-   
+    
     </view>
     <!--foot-->
     <view style='width:100%;border-bottom:10rpx solid #eee; '> 
     <view class='pd-list-foot'>
-      <view class='foot-left'>
+      <view class='foot-left flex'>
         共{{item.order_goods[0].goods_num}}件, 
+        <view class="t-c">
         <block wx:if="{{item.is_zsorder==4}}">
             <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
                金额：<text class="xc-wc">￥</text>
@@ -80,6 +81,7 @@
            金额：<text class="xc-wc">￥</text>
            <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
         </block>
+        </view>
       </view>
       <view class='foot-right'>
@@ -361,7 +361,7 @@ height:86rpx;
 }
 .xc-still-bad{
-line-height:100rpx;
+line-height:10rpx;
 }
 .xc-ellipsis{
   line-height:121rpx;
@@ -374,5 +374,5 @@ margin-left:5rpx;
     color: #e4374d;
     font-weight: normal;
     margin-top:-40rpx; 
-    margin-left:78rpx 
+  
 }
 \ No newline at end of file
@@ -186,7 +186,7 @@
     <view class='buy-top'>
       <view class='buy-image mimg'>
         <image src='{{image}}'></image>
-        <view style='float:left'>
+        <view>
            <view>
             <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
            </view> 
-var t = getApp(),oo=t.globalData, a = t.globalData.setting,os=a, e = t.request, s = require("../../../utils/util.js"), i = require("../../../utils/selectFiles.js");
+var t = getApp(),oo=t.globalData, a = t.globalData.setting,os=a, e = t.request, s = require("../../../utils/util.js"),
+    i = require("../../../utils/selectFiles.js");
+var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
     data: {
@@ -18,12 +20,16 @@ Page({
         isLongPress: !1,
         userinfo:null,
     },
-    onLoad: function(a) {
+    onLoad:async function(a) {
         var th=this;
-       
         console.log('onLoad');
         console.log(a);
+        await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+a.goods_id,{1:1}).then(res=>{
+           a.img=th.data.iurl+res.data.data.original_img
+        })
+
+
         this.setData({options: a});
         t.getUserInfo(function(e){
           console.log(e);
@@ -107,8 +107,8 @@
            <view class="item-line"></view>
            <view class="item" wx:if="{{order.user_money>0}}">
               <view>使用余额</view>
-              <view wx:if="{{order.tail_pay_type==1}}">￥ {{order.user_money+order.pt_tail_money}}元</view>
-              <view wx:else>￥ {{order.user_money}}元</view>
+              <view wx:if="{{order.tail_pay_type==1}}">￥ {{filters.toFix(order.user_money+order.pt_tail_money,2)}}元</view>
+              <view wx:else>￥ {{filters.toFix(order.user_money,2)}}元</view>
            </view>
     </view>
@@ -60,10 +60,13 @@
                     </view>
                 </view>
-                <view class="check-btn">
+              
+            </view>
+
+  <view class="check-btn">
                     <navigator url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}"
                                class="order-btn order-btn-pay" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
-                    <navigator bindtap="jumpToCart4" class="order-btn order-btn-pay" data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
+                    <navigator bindtap="jumpToCart4 white red-b" class="order-btn order-btn-pay " data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
                     <view  class="order-btn" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3 }}">已取消</view>
                     <view bindtap="cancelOrder" class="order-btn" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}"
                           hidden="{{!(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
@@ -80,14 +83,14 @@
                       </block>
-                    <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
-                     <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
-                    <navigator redirect class="order-btn" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
+                    <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==1)}}">确认收货</view>
+                     <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>
                 </view>
-            </view>
+
         </view>
         <view class="no-data" wx:if="{{ (!orderList||orderList.length==0) && is_get}}">
             <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
@@ -40,6 +40,8 @@
     margin-bottom: 20rpx;
     font-size: 28rpx;
     border-bottom: 1rpx solid #eee;
+    padding-bottom: 25rpx;
+
 }
 .goods-title {
@@ -108,7 +110,7 @@
 .goods-tips {
     height: 60rpx;
-    padding: 50rpx 0;
+    padding: 10rpx 0;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -127,14 +129,14 @@
 }
 .order-btn {
-    width: 125rpx;
-    height: 60rpx;
-    line-height: 60rpx;
+    width: 150rpx;
+    height: 50rpx;
+    line-height: 50rpx;
     text-align: center;
     border: 1px solid #eee;
     margin-left: 10rpx;
     float: right;
-    border-radius: 5rpx;
+    border-radius: 15rpx;
 }
 .order-btn-pay {
@@ -143,3 +145,6 @@
     border-color: #f23030;
 }
 .return-btn.co-red{color: #e02e24}
+.check-btn{
+  margin-bottom: 20rpx;
+}
 \ No newline at end of file
@@ -21,18 +21,25 @@ Page({
         causeList: [ "订单不能按预计时间送达", "操作有误（商品、地址等选错）", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了" ],
         checkCauseIndex: -1,
         popState: !0,
-        description: ""
+        description: "",
+        return_type:0,
     },
     onLoad: function(e) {
         var a = this;
+       
+        getApp().getConfig2(function (em) {
+           a.data.return_type = em.return_type; 
+        });
+
         this.setData({
             recId: e.rec_id
         }), this.requestReturnGoods(e), t.getConfig(function(t) {
             a.setData({
-                 "config.address": t.store_address,
-                 "config.phone": t.store_tel,
+                "config.address": t.store_address,
+                "config.phone": t.store_tel,
             });
         });
+      
     },
     requestReturnGoods: function(t) {
         var e = this;
@@ -147,6 +154,7 @@ Page({
                       goods_id: th.data.order.goods_id,
                       addtime: ut.gettimestamp(),
                       type:2,
+                      return_type: th.data.return_type,
                     },
                     success: function(t) {
                         wx.showToast({