oa单测试返回

abson
1 parent 6898e916
Showing 7 changed files with 40 additions and 28 deletions
packageA/pages/quan_pro/quan_pro.wxml
packageA/pages/quan_pro/quan_pro.wxss
packageB/pages/zuhegou/index/index.js
packageB/pages/zuhegou/list/list.js
pages/activity/pind_list/pind_list.js
pages/activity/seckill_list/seckill_list.js
pages/cart/cart2/cart2.js
@@ -16,9 +16,9 @@
                 <view class="fs30 flex" wx:if="{{q_data}}" style="height: 100rpx;justify-content: space-between;">
                     <view class="flex ai-center">
                         <view class="t_circle"></view>
-                        <view>
+                        <view class="ellipsis-2" style="width: 400rpx;">
                             <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text>
-                            <text wx:else>仅限{{q_data.useobjectname}}使用</text>
+                            <text wx:else >仅限{{q_data.useobjectname}}使用</text>
                         </view>
                     </view>
                     <view>
@@ -10,7 +10,7 @@ page{background-color: #f8f8f8;}
 .q_content{ position: absolute;top: 0; left: 0; width: calc(100% - 40rpx); height: 450rpx;padding: 0 20rpx; }
 .upper{ height:330rpx;}
 .lower{ height: 120rpx; line-height: 170rpx;color:#7a668f}
-.quan_box {display: flex;flex-direction: column;justify-content: flex-start;  box-sizing: border-box;}
+.quan_box {display: flex;flex-direction: column; box-sizing: border-box;}
 .upper .left{ margin-left:30rpx; margin-top: 30rpx }
 .t_circle{ width: 10rpx; height: 10rpx; border-radius: 50%; background-color: #fff; margin-right: 8rpx}
@@ -27,5 +27,5 @@ page{background-color: #f8f8f8;}
 }
 .btn.gray{background-color: #dcdcdc; color: #adb3be;}
-.coupon_remark{padding: 20rpx 0; box-sizing: border-box; overflow: hidden;}
+.coupon_remark{padding: 30rpx 0 10rpx 0; box-sizing: border-box; overflow: hidden;}
@@ -1990,11 +1990,12 @@ Page({
                                     // be=be-bz_num_ok;
                                     if(num % vv.zhqty == 0){
                                         be=num/vv.zhqty;
-                                        bz_num_ok=num;
+                                        // bz_num_ok=num;
                                     }else{
                                         be = Math.floor(num/vv.zhqty)
-                                        bz_num_ok=num - (be * vv.zhqty);
+                                        // bz_num_ok=be * vv.zhqty ;
                                     }
+                                    bz_num_ok=be * vv.zhqty ;
                             }
                             for(let i=0;i<zhqty_bz.length;i++){
                                 var vv=zhqty_bz[i];
@@ -2024,13 +2025,13 @@ Page({
                                     // be=be-bz_num_ok;
                                     if(num % vv.zhqty == 0){
                                         be=num/vv.zhqty;
-                                        bz_num_ok=num;
+                                        // bz_num_ok=num;
                                     }else{
                                         be = Math.floor(num/vv.zhqty)
-                                        bz_num_ok=num - (be * vv.zhqty);
+                                        // bz_num_ok=be * vv.zhqty;
                                     }
+                                    bz_num_ok=be * vv.zhqty;
                                 }
-                                // be=vv.num;
                                 for(let j=0;j<bz_num_ok;j++){
                                     let index= no_in_arr.findIndex(i=>{
                                          return vv.goods_id===i.goods_id
@@ -137,7 +137,7 @@ Page({
           isShowLoading:1,
           data:{
             store_id: os.stoid,
-            user_id: getApp().globalData.user_id
+            user_id: getApp().globalData.user_id,
           }
         })
         if(res.code==0 && res.data.pageData.length>0){
@@ -61,7 +61,12 @@ Page({
         });
       }
     })
-
+    // var user_id=getApp().globalData.user_id;
+    // if(!user_id) user_id=0;
+    // this.setData({
+    //   user_id,
+    // })
+    this.requestSalelist();
   },
   onShow: function (t) {
@@ -69,13 +74,15 @@ Page({
     this.data.currentPage = 1;
     this.data.ismore = 1;
     var th = this;
-    var userInfo = wx.getStorageSync('userinfo');
-    if (userInfo && th.data.goodlist.length==0) {
-      //调用列表
-      this.requestSalelist(userInfo.user_id);
-    } else {
-      getApp().goto("/pages/togoin/togoin");
-    }
+    // var userInfo = wx.getStorageSync('userinfo');
+    // if (userInfo) {
+    //   //调用列表
+    //   this.requestSalelist(userInfo.user_id);
+    // } else {
+    //   getApp().goto("/pages/togoin/togoin");
+    // }
+
+    
     //设置全局定时器
     th.data.timer = setInterval(function () {
       th.countDown();
@@ -129,7 +136,7 @@ Page({
    },
   //读取数据
-  async requestSalelist(user_id) {
+  async requestSalelist() {
     if (!this.data.ismore) return false;
     var e = this,
       th = e,
@@ -143,7 +150,7 @@ Page({
         store_id: os.stoid,
         is_end: 0,
         is_show: 1,
-        user_id,
+        user_id:getApp().globalData.user_id,
       }
     }).then(res => {
       plist = res.data.data.pageData;
@@ -178,7 +185,7 @@ Page({
     this.reloadGoodList();
   },
   reloadGoodList: function () {
-    this.data.goodlist = null, this.data.currentPage = 1, this.requestSalelist();
+    this.data.goodlist = [], this.data.currentPage = 1, this.requestSalelist();
   },
   onReachBottom: function () {
     this.requestSalelist();
@@ -73,7 +73,6 @@ Page({
   onShow: function (t) {
-    this.data.ismore = 1;
     this.data.is_timer = 1;
     this.data.currentPage = 1;
     var th = this;
@@ -1542,7 +1542,7 @@ Page({
                     cart_item.shipping_price = 0;
                     //--有不包邮区域，且不免运费,全场的计算,要减到优惠金额 和券的金额--
-                    if (no_ex_id && freight_free > 0 && (o_price - quan_price) >= freight_free && cart_item.exp_type == 0 && (by_qc.region_list || by_qc.goods_list) && out_of_weight > 0) {
+                    if (no_ex_id && freight_free > 0 && (o_price - quan_price) >= freight_free && cart_item.exp_type == 0 && (by_qc.region_list || by_qc.goods_list) && out_of_weight >= 0) {
                         //如果有设置不包邮区域的时候
                         if (by_qc.region_list != "" && by_qc.region_list != null && by_qc.region_list != undefined) {
                             if (th.check_by_area(by_qc.region_list)) {
@@ -2481,8 +2481,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 = is_vip.salesman;
-                            g_goods.guide_sn = is_vip.salesman_no;
+                            g_goods.guide_name = res.data.salesman;
+                            g_goods.guide_sn = res.data.salesman_no;
                         }
                     })
                 }
@@ -3037,7 +3037,7 @@ Page({
         var price = 0, th = this;
         price += parseFloat(o_shipping_price);
         //如果是包邮
-        if (freight_free > 0 && o_price >= freight_free && out_of_weight>0) {
+        if (freight_free > 0 && o_price >= freight_free && out_of_weight>=0) {
             return 0;
         }
         if (user_addr == null) {
@@ -3067,8 +3067,13 @@ Page({
         if(out_of_weight < 0){
             fw_price = parseFloat(item['money']);
             var out_of_weight = Math.abs(out_of_weight);
-            var n = Math.ceil(out_of_weight / item['second_weight'])
-            fw_price = fw_price + n * parseFloat(item['add_money']);
+            // var n = Math.ceil(out_of_weight / item['second_weight'])
+            // fw_price = fw_price + n * parseFloat(item['add_money']);
+            if (out_of_weight > item['first_weight']) {
+                var fw = out_of_weight - item['first_weight'];
+                var n = Math.ceil(fw / item['second_weight'])
+                fw_price = fw_price + n * parseFloat(item['add_money']);
+            }
         }
         //------按件数----------
         if (goods_piece > 0 && item['piecemoney']) {