qa oa单优化

abson
1 parent a8d2d181
Showing 3 changed files with 6 additions and 5 deletions
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
pages/cart/cart/cart.wxml
pages/cart/cart2/cart2.js
@@ -1374,7 +1374,7 @@ Page({
                         o_price += item[j].goods_price * item[j].goods_num;
  
                         //判断是否有设置限制重量包邮
-                        if(item[j]['is_past']!==1 && item[j]['exp_sum_type']==2 && weight_free>0){
+                        if(item[j]['is_past']!==1 && item[j]['exp_sum_type']==2){
                             if (goods_weight < 0) goods_weight = 0;
                                 //累积商品重量 每种商品的重量 * 数量
                             goods_weight += item[j]['weight'] * item[j]['goods_num'];
@@ -41,7 +41,8 @@
     <!-- 编辑 -->
     <view class="padding flex-vertical-between fs30 Storenum store" style="justify-content:space-between">
       <view wx:if="{{freight_free}}" class="fs28 pdr20 pdl20 c-red2 flex jc_sb weight_free">
-        <text>全场满{{freight_free}}元可享包邮({{weight_free}}kg内)</text>
+        <text wx:if="{{weight_free <=0}}">全场满{{freight_free}}元可享包邮</text>
+        <text wx:else>全场满{{freight_free}}元可享包邮({{weight_free}}kg内)</text>
       </view>
       <view wx:if="{{is_edit==0}}" bindtap="edit_cart" data-type="1">编辑</view>
       <view wx:else bindtap="edit_cart" data-type="0">完成</view>
@@ -1483,7 +1483,7 @@ Page({
                         o_price += item[j].goods_price * item[j].goods_num;
  
                         //判断是否有设置限制重量包邮,先看商品有没有包邮
-                        if(item[j]['is_past']!==1 && item[j]['exp_sum_type']==2 && weight_free>0){
+                        if(item[j]['is_past']!==1 && item[j]['exp_sum_type']==2){
                             if (goods_weight < 0) goods_weight = 0;
                                 //累积商品重量 每种商品的重量 * 数量
                             goods_weight += item[j]['weight'] * item[j]['goods_num'];
@@ -2482,8 +2482,8 @@ Page({
                     //调用接口判断是不是会员
                     await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => {
                         if (res.data.code == 0) {
-                            g_goods.guide_name = res.data.salesman;
-                            g_goods.guide_sn = res.data.salesman_no;
+                            g_goods.guide_name = res.data.data.salesman;
+                            g_goods.guide_sn = res.data.data.salesman_no;
                         }
                     })
                 }