Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents e66dcc90 c8f5250c
Showing 6 changed files with 86 additions and 11 deletions
app.wxss
packageE/pages/cart/cart2/cart2.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
utils/pay.js
utils/wxlog.js
@@ -1343,3 +1343,5 @@ checkbox .wx-checkbox-input {
     height: 32rpx !important;
     margin-right: 16rpx;
 }
+
+
@@ -2249,6 +2249,7 @@ Page({
                 original_img: th.data.imgUrl + get_data.goodsinfo.original_img,
                 weight:get_data.goodsinfo.weight,   //赠品在计算运费必须的字段
                 exp_sum_type:get_data.goodsinfo.exp_sum_type,  //赠品在计算运费必须的字段
+                uniform_exp_sum:get_data.goodsinfo.uniform_exp_sum,  //赠品在计算运费必须的字段
               };
               var fd_gd=ord_goods[pos]
@@ -2258,6 +2259,10 @@ Page({
               newd.is_order_yh = fd_gd.is_order_yh;
               newd.is_post_temp = fd_gd.is_post_temp;
+              if(get_data.zp_by>0){
+                newd.is_past=1;
+              }
+
               ord_goods.splice(pos+1,0,newd);
               th.data.old_cartlist[i].goods.splice(pos2+1,0,newd);
@@ -2340,12 +2345,20 @@ Page({
                 item_map.lbtitle = get_data.lbtitle;
                 item_map.zxlbtitle = get_data.zxlbtitle;
+
+
+
                 var rule=JSON.parse(get_data.rule);
                 if(rule.is_monthgiftbag &&  parseFloat(rule.is_monthgiftbag )>0){
                   //每月礼包
                   item_map.monthlbtitle = get_data.monthlbtitle;
                 }
+                //-- 单赠品和多赠品 --
+                if(get_data.gift_id || parseInt(get_data.zp_mode) == 1){
+                  item_map.zp_by=rule.zp_by;
+                  get_data.zp_by=rule.zp_by;
+                }
                 //-- 其他门店赠品的总和 --
                 var other_gift=0;
                 other_gift=th.get_other_gift(c_arr,get_data.gift_id,pickid);
@@ -2416,6 +2429,7 @@ Page({
                       pickup_id: pickid,
                       giftsinfo: get_data.giftsinfo,
                       zp_num: get_data.zp_num * get_data.bs,
+                      zp_by: get_data.zp_by,
                       gf_pr_name: item_map.name,
                       prom_id: item_map.prom_id,
                       bs: parseInt(get_data.bs),
@@ -6476,6 +6490,7 @@ Page({
     var check = this.check_good(arr, goods_id);
     return !check;
   },
+
   //立即购买获取优惠活动的内容
   buy_now_prom_goods: async function (prom_id, arr, func) {
     var th = this;
@@ -7394,6 +7409,8 @@ Page({
         new_pk_list_goods.push(item)
       }
+      var set_data = this.data.send_gf[gf_pickup_id][this.data.send_gf_index];
+
       //-- 循环把赠品添加进去 --
       for (var i = 0; i < giftsinfo.length; i++) {
         var gf_item = giftsinfo[i];
@@ -7428,8 +7445,13 @@ Page({
         var fd=prom_goods_map[th.data.gf_prom_id];
         if(fd){
-          newd.is_past=fd.is_past;
+          //newd.is_past=fd.is_past;
           newd.is_xz_yh=fd.is_xz_yh;
+          //赠品包邮的优化
+          if(set_data.zp_by && set_data.zp_by>0){
+            newd.is_past=1;
+          }
+
         }
         //赠品的优惠要和商品的一样
@@ -7455,7 +7477,7 @@ Page({
         }
       }
-      var set_data = this.data.send_gf[gf_pickup_id][this.data.send_gf_index];
+
       set_data.selected = 1;
       var txt9 = "cartlist[" + index + "].goods";
@@ -546,6 +546,23 @@ Page({
                         })
                     }
+                    //-- 如果只限定链接的时候，要取消分享按钮 --
+                    if(res.data.data.is_share){
+                        wx.hideShareMenu();
+                        wx.offCopyUrl()
+                        //替换掉复制链接
+                        wx.onCopyUrl(() => {
+                            setTimeout(()=>{
+                                wx.setClipboardData({
+                                    data: '暂不支持分享',
+                                    success (res) { }
+                                })
+                            },500)
+                            return { query: 'a=1&b=2' }
+                        })
+                    }
+
+
                     var isStart = 0;
                     var now = ut.gettimestamp();
@@ -565,7 +582,8 @@ Page({
                         actTitle: res.data.data.actTitle,
                         wareCard: res.data.data.wareCard,
                         isStart: isStart,
-                        sele_g: res.data.data
+                        sele_g: res.data.data,
+                        is_share:res.data.data.is_share
                     })
@@ -13,7 +13,7 @@
       <text class="data-v-3a5b7e36 ellipsis-2" style="width:90%;">{{giftTitle}}</text>
         <!-- 这个是分享按钮 --> 
-        <view wx:if="{{c_state<2 && isLogin}}" class="xc-share-frame t-c" bindtap="clickShare">
+        <view wx:if="{{c_state<2 && isLogin && !is_share}}" class="xc-share-frame t-c" bindtap="clickShare">
             <view class="iconfont icon-share fs40" ></view>
             <view class="fs22 c-7b">分享</view>
         </view>
@@ -59,9 +59,6 @@
         <text class="data-v-3a5b7e36">{{actTitle}}</text>
       </block>
-
-
-
     </view>
     <view class="top_foot data-v-3a5b7e36">
       <view class="top_foot_price data-v-3a5b7e36 no_line_x">
 var t = getApp(), n = t.request;
+var wxlog = require("wxlog.js");
 module.exports = {
     wx_paying:0,
@@ -149,13 +150,14 @@ module.exports = {
                             return false;
                         }
-
-
-
-
                         wx.openEmbeddedMiniProgram({
                             appId: 'wxef277996acc166c3',
                             extraData: p_data,
+                            success:function(res){
+                                
+                               wxlog.info('通联支付跳转'+JSON.stringify(res));
+                               wxlog.info(JSON.stringify(p_data));
+                            },
                             fail(){
                                 //-- 取消不支付 --
                                 i.wx_paying=0;
+var wxlog = wx.getRealtimeLogManager ? wx.getRealtimeLogManager() : null
+
+module.exports = {
+    debug() {
+        if (!wxlog) return
+        wxlog.debug.apply(wxlog, arguments)
+    },
+    info() {
+        if (!wxlog){
+            console.log('没有实时日志');
+            return
+
+        }
+        wxlog.info.apply(wxlog, arguments)
+    },
+    warn() {
+        if (!wxlog) return
+        wxlog.warn.apply(wxlog, arguments)
+    },
+    error() {
+        if (!wxlog) return
+        wxlog.error.apply(wxlog, arguments)
+    },
+    setFilterMsg(msg) { // 从基础库2.7.3开始支持
+        if (!wxlog || !wxlog.setFilterMsg) return
+        if (typeof msg !== 'string') return
+        wxlog.setFilterMsg(msg)
+    },
+    addFilterMsg(msg) { // 从基础库2.8.1开始支持
+        if (!wxlog || !wxlog.addFilterMsg) return
+        if (typeof msg !== 'string') return
+        wxlog.addFilterMsg(msg)
+    }
+}
 \ No newline at end of file