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

后端研发-苏泰源
2 parents 08d3358a 54919013
Showing 11 changed files with 160 additions and 104 deletions
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/buygiftpack/giftpackbuy.wxml
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/mygiftpack/mygiftpack.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
utils/pay.js
utils/pay2.js
@@ -5,10 +5,8 @@ var regeneratorRuntime = require(&#39;../../../utils/runtime.js&#39;);
 var util_pay = require("../../../utils/pay.js");
 var zh_calc = require("zh_calculate.js");
 var ladder_calc = require("ladder_calculate.js");
-
 // 防抖函数用定时器
 let timer;
-
 Page({
     data: {
         url: t.globalData.setting.url,
@@ -93,13 +91,11 @@ Page({
         is_coupon: 1,     //选择券的控制属性
         is_shipping_code: "",//插入用户默认地址
         wu_arr_txt: "",      //要更新的物流的字段
-
         sales_rules: 1,         //默认是显示线上库存
         isget_by_quan: {},       //是否调用了接口获取包邮券
         get_by_quan_list: null,       //立即购买的
         get_by_quan_list_cart: {},    //购物车的
         by_quan_list_cart: null,   //点击选择的包邮列表
-
         //如果是全场包邮了，或者是全场不包邮了，就不要选包邮券
         is_no_by: {},
         is_by: {},
@@ -2347,15 +2343,15 @@ Page({
                 }
             }
         })
+        this.setData({
+            submit:1,
+        })
     },
     //--------------------提交订单-----------------------
     async submit_func() {
-        if (this.data.is_summit_ing == 1) return false; //--提交中退出--
-        this.data.is_summit_ing = 1;
         var th = this, pdata = new Array();
         var ff = true;
-
         //------------立即购买-------------
         if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
             if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
@@ -2981,6 +2977,9 @@ Page({
                 console.log("index.js wx.request CheckCallUser fail");
             },
             complete: function () {
+                this.setData({
+                    submit:0,
+                })
             }
         })
@@ -4370,15 +4369,22 @@ Page({
     },
     //订阅消息提醒
     sendsm: function (func) {
+        let th =this;
         var template_id = this.data.template_id;
         // //授权订阅
         wx.requestSubscribeMessage({
             tmplIds: [template_id],
             success(res) {
                 func();
+                th.setData({
+                    submit:0,
+                })
             },
             fail(res) {
                 func();
+                th.setData({
+                    submit:0,
+                })
             }
         })
@@ -455,7 +455,7 @@
 			<view class="payable">应付金额：<text class="co-red"><text class="fs24">￥</text>{{formData.order_amount}}</text></view>
 			<!-- <view class="co-red big"></view> -->
 		</view>
-		<button  class="tips-btn" formType="submit" id="submitOrder" bindtap="requestSubscribe">提交订单</button>
+		<button  class="tips-btn" formType="submit" id="submitOrder" disabled="{{submit}}" bindtap="requestSubscribe">提交订单</button>
 	</view>
 </form>
@@ -29,14 +29,20 @@ Page({
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function (options) {
-    
+    this.setData({
+      params: options,
+    })
+
+  },
+  init() {
     var th = this;
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open_cancel(0);
-    th.setData({
+    let options = this.data?.params;
+    this.setData({
       getStorageID: a.stoid,
       getUserID: d.user_id
     });
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open_cancel(0);
     //-- 获取分享人的ID --
     var first_leader = options.first_leader || getApp().globalData.first_leader;
     if (first_leader) {
@@ -52,8 +58,6 @@ Page({
         }
       })
     }
-
-
     getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
       data: {
         enabled: 1
@@ -72,19 +76,18 @@ Page({
         });
       }
     })
-    
-
+    this.getList();
   },
   onShow: function () {
     //--先判断会员状态--
-    getApp().is_Single_page(this,function(){
+    getApp().is_Single_page(this, function () {
       var user_info = getApp().globalData.userInfo;
       if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-          getApp().goto('/pages/togoin/togoin');
-          return false;
+        getApp().goto('/pages/togoin/togoin');
+        return false;
       }
-      this.getList();
     })
+    this.init();
   },
   //购买礼包
@@ -190,7 +193,7 @@ Page({
         if (getApp().globalData.guide_id) {
           json.guide_id = getApp().globalData.guide_id;
         }
-        console.log(json,'json');
+        console.log(json, 'json');
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
@@ -201,7 +204,7 @@ Page({
               getApp().my_warnning(res.data.msg, 0, th);
             }
           },
-          function (res) {})
+          function (res) { })
       })
@@ -245,7 +248,7 @@ Page({
               getApp().my_warnning(res.data.msg, 0, th);
             }
           },
-          function (res) {})
+          function (res) { })
       })
   },
@@ -271,12 +274,14 @@ Page({
             wareCard: arr3,
             total: res.data.data.total,
             ismore: ismore,
-            is_read: 1
+            is_read: 1,
+            is_get:1
           }), wx.stopPullDownRefresh(); //停止下拉刷新
         } else {
           th.setData({
             is_read: 1,
-            ismore: 1
+            ismore: 1,
+            is_get:1
           })
         }
       }
@@ -326,7 +331,7 @@ Page({
     if (pagePath.indexOf('/') != 0) {
       pagePath = '/' + pagePath;
     }
-    pagePath += "?first_leader="+this.data.getUserID;
+    pagePath += "?first_leader=" + this.data.getUserID;
     return {
       title: "专享礼包",
       path: pagePath,
@@ -340,7 +345,7 @@ Page({
     if (pagePath.indexOf('/') != 0) {
       pagePath = '/' + pagePath;
     }
-    pagePath += "?first_leader="+this.data.getUserID;
+    pagePath += "?first_leader=" + this.data.getUserID;
     return {
       title: '专享礼包',
       imageUrl: this.data.ad_data.ad_code,
@@ -94,7 +94,7 @@
       </view>
     </view>
   </block>
-  <block wx:if="{{is_read && wareCard.length<1}}">
+  <block wx:if="{{is_read && wareCard.length<1 && is_get}}">
     <view class="foot_empty">
       <view>
         <image src="{{iurl+'/miniapp/images/giftbag/gift07.png'}}" lazy-load="true"></image>
@@ -32,14 +32,22 @@ Page({
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function (options) {
+    this.setData({
+      params:options,
+    })
+  },
+  init(){
+    let options = this.data?.params;
     var th = this;
-    th.setData({
+    this.setData({
+      getUserID: d.user_id,
+      getStorageID: a.stoid,
+    })
+    this.setData({
       isBuy: options.isBuy,
       getGiftID: options.lbId,
       orderSn: options.orderSn,
-      getUserID: d.user_id,
     })
-
     if (options.lbId) th.data.lbId = options.lbId;
     //-- 获取分享人的ID --
     var first_leader = options.first_leader || getApp().globalData.first_leader;
@@ -57,6 +65,11 @@ Page({
       })
     }
     th.close();
+    if (this.data.isBuy == 0) {
+      this.GetMyGiftList();
+    } else {
+      this.GetBuyGiftList();
+    }
   },
   onShow: function () {
@@ -67,11 +80,7 @@ Page({
         getApp().goto('/pages/togoin/togoin');
         return false;
       }
-      if (this.data.isBuy == 0) {
-        this.GetMyGiftList();
-      } else {
-        this.GetBuyGiftList();
-      }
+      this.init();
     })
   },
   GetBuyPrice: function (e) {
@@ -25,19 +25,24 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
-    ad_data:null,
+    ad_data: null,
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
+  onLoad: function (options) {
+    this.setData({
+      params: options,
+    })
+  },
-  onLoad: function(options) {
+  init() {
+    let options = this.data?.params;
     var th = this;
-    th.setData({
+    this.setData({
       getStorageID: a.stoid,
       getUserID: d.user_id,
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
     });
-    
     //-- 获取分享人的ID --
     var first_leader = options.first_leader || getApp().globalData.first_leader;
     if (first_leader) {
@@ -53,39 +58,39 @@ Page({
         }
       })
     }
-	
-	getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
-	  data: {
-	    enabled: 1
-	  }
-	}).then(res => {
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-			var a = res.data.data.pageData;
-			var tt = {
-			  'ad_code': os.imghost + a[0].ad_code,
-			  'media_link': '',
-			  'ad_weapplink':a[0].ad_weapplink,
-			  'bgcolor':a[0].bgcolor,
-			};
-			th.setData({ad_data:tt});				
-		}					 			
-	})
+    getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+      data: {
+        enabled: 1
+      }
+    }).then(res => {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+        var a = res.data.data.pageData;
+        var tt = {
+          'ad_code': os.imghost + a[0].ad_code,
+          'media_link': '',
+          'ad_weapplink': a[0].ad_weapplink,
+          'bgcolor': a[0].bgcolor,
+        };
+        th.setData({ ad_data: tt });
+      }
+    })
+    this.getList();
   },
-  onShow: function() {
+  onShow: function () {
     //--先判断会员状态--
-    getApp().is_Single_page(this,function () {
+    getApp().is_Single_page(this, function () {
       var user_info = getApp().globalData.userInfo;
       if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-          getApp().goto('/pages/togoin/togoin');
-          return false;
+        getApp().goto('/pages/togoin/togoin');
+        return false;
       }
-      this.getList();
+      this.init()
     })
-   
+
   },
-  getList: function() {
+  getList: function () {
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/page', {
@@ -96,7 +101,7 @@ Page({
         page: th.data.curpage,
         pageSize: th.data.pageSize
       },
-      success: function(res) {
+      success: function (res) {
         if (res.data.code == 0) {
           th.data.curpage++;
           var arr1 = th.data.wareCard;
@@ -108,12 +113,14 @@ Page({
             wareCard: arr3,
             total: res.data.data.total,
             ismore: ismore,
-            is_read: 1
+            is_read: 1,
+            is_get:1,
           }), wx.stopPullDownRefresh(); //停止下拉刷新
         } else {
           th.setData({
             is_read: 1,
-            ismore:1
+            ismore: 1,
+            is_get:1,
           })
         }
@@ -123,7 +130,7 @@ Page({
   },
   //销毁界面跳转
-  redirectTo: function(e) {
+  redirectTo: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     //销毁跳转
@@ -132,13 +139,13 @@ Page({
     });
   },
   //不销毁界面跳转
-  navigateTo: function(e) {
+  navigateTo: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
   //下拉事件
-  onReachBottom: function() {
+  onReachBottom: function () {
     var th = this;
     if (th.data.total <= th.data.pageSize) return;
     if (th.data.ismore) return;
@@ -146,7 +153,7 @@ Page({
   },
   //图片失败，默认图片
-  bind_bnerr2: function(e) {
+  bind_bnerr2: function (e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
@@ -154,33 +161,33 @@ Page({
   },
-//--- 分享设置 --
-onShareAppMessage: function (e) {
-  var curPage=this;
-  var pagePath = curPage.route; //当前页面url
-  if (pagePath.indexOf('/') != 0) {
-    pagePath = '/' + pagePath;
-  }
-  pagePath += "?first_leader="+ this.data.getUserID;
-  return {
-    title: "专享礼包",
-    path:pagePath,
-  }
-},
+  //--- 分享设置 --
+  onShareAppMessage: function (e) {
+    var curPage = this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    pagePath += "?first_leader=" + this.data.getUserID;
+    return {
+      title: "专享礼包",
+      path: pagePath,
+    }
+  },
-	onShareTimeline() {
-		var curPage=this;
-		var pagePath = curPage.route; //当前页面url
-		if (pagePath.indexOf('/') != 0) {
-		  pagePath = '/' + pagePath;
+  onShareTimeline() {
+    var curPage = this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    pagePath += "?first_leader=" + this.data.getUserID;
+    return {
+      title: '专享礼包',
+      imageUrl: this.data.ad_data.ad_code,
+      path: pagePath,
     }
-    pagePath += "?first_leader="+ this.data.getUserID;
-		return {
-		  title: '专享礼包',
-			imageUrl: this.data.ad_data.ad_code,
-		  path: pagePath,
-		}
-	},
+  },
 });
 \ No newline at end of file
@@ -96,7 +96,7 @@
       </view>
     </view>
   </block>
-  <block wx:if="{{is_read && wareCard.length<1}}">
+  <block wx:if="{{is_read && wareCard.length<1 && is_get}}">
     <view class="foot_empty">
       <view>
         <image src="{{iurl+'/miniapp/images/giftbag/gift07.png'}}" lazy-load="true"></image>
@@ -3664,7 +3664,6 @@ Page({
                                     pageSize: 1000
                                 }
                             }).then(res => {
-
                                 let pd_list = res.data.data.pageData;
                                 if (res.data.code == 0 && pd_list.length > 0) {
                                     flag = pd_list.some(pd => {
@@ -4394,6 +4393,7 @@ Page({
     go_cj_team: function (e) {
         var ind = e.currentTarget.dataset.ind;
         var item = this.data.teamgroup[ind];
+        var goods_id = e.currentTarget.dataset.goodsid;
         var id = item.id;
         var th = this;
@@ -4438,15 +4438,17 @@ Page({
                         getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
                     } else {
+                        console.log(222,goods_id)
                         wx.navigateTo({
-                            url: "/pages/team/team_show/team_show?tg_id=" + id,
+                            url: "/pages/team/team_show/team_show?tg_id=" + id +"&goods_id="+goods_id,
                         });
                     }
                 }
                 //--跳转到参团--
                 else {
+                    console.log(1111,th.data.goods_id)
                     wx.navigateTo({
-                        url: "/pages/team/team_show/team_show?tg_id=" + id,
+                        url: "/pages/team/team_show/team_show?tg_id=" + id+"&goods_id="+goods_id,
                     });
                 }
             }
@@ -216,7 +216,7 @@
               </view>
             </view>
             <view class='group' wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup">
-              <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}">
+              <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}" data-goodsid="{{data.goods_id}}">
                 <!-- <view class="flex ai_c"> -->
                 <!-- //选项框头像 -->
                 <view class='gtou'>
-var t = getApp(), n = t.request;
+var t = getApp(), n = t.request,wx_paying=0;
 module.exports = {
     url: "/api/weshop/order/pay/createOrder",
@@ -20,6 +20,10 @@ module.exports = {
         });
     },
     pay: function(t, e, a,sto,type) {
+
+        if(wx_paying) return false;
+        wx_paying=1;
+
         var i = this;
         var dd = {
           parent_sn: t,
@@ -28,9 +32,11 @@ module.exports = {
         };
         if (type == 1) dd.type = 1;
+        wx.showLoading();
         n.post(this.url, {
             data: dd,
             success: function(t) {
+                wx.hideLoading();
                 if(t.data.code==0){
                     i.weixinPay(t.data.data, e, a);
                 }else{
@@ -39,14 +45,19 @@ module.exports = {
                         wx.redirectTo({
                             url: "/pages/user/order_list/order_list",
                         });
-                    },1000)                
+                    },1000)
+                    wx_paying=0;
                 }
                 return false;
             },
             fail: function() {
+                wx.hideLoading();
+                wx_paying=0;
                 "function" == typeof a && a();
             },
             failStatus: function() {
+                wx.hideLoading();
+                wx_paying=0;
                 "function" == typeof a && a();
             }
         });
@@ -64,9 +75,11 @@ module.exports = {
                paySign: n.paySign,
                orderInfo: n.orderInfo, // 需要新增的 订单 信息
                success (n) {
+                   wx_paying=0;
                    t.showSuccess("支付成功！", e);
                },
                fail (n) {
+                   wx_paying=0;
                    if(!n.errMsg )  {
                        getApp().showWarning("支付失败");
                        "function" == typeof fail && fail();
@@ -87,9 +100,11 @@ module.exports = {
                signType: n.signType,
                paySign: n.paySign,
                success: function (n) {
+                   wx_paying=0;
                    console.log(n), t.showSuccess("支付成功！", e);
                },
                fail: function (n) {
+                   wx_paying=0;
                    console.log(n), "requestPayment:fail" == n.errMsg ? t.showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? t.showWarning("您已取消支付") :
                            t.confirmBox("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
                    "function" == typeof a && a();
-var t = getApp(), n = t.request;
+var t = getApp(), n = t.request,wx_paying=0;
 module.exports = {
     url: "/api/weshop/plus/create/plus/order",
     pay: function(dd, succ,fail) {
+
+        if(wx_paying) return false;
+        wx_paying=1;
+
+        wx.showLoading();
         var i = this;
         n.post(this.url, {
             data: dd,
             success: function(t) {
+                wx.hideLoading();
                 if(t.data.code==0){
                     if(t.data.data=="升级成功"){
                         "function" == typeof succ && succ(1);
@@ -19,9 +25,13 @@ module.exports = {
                 return false;
             },
             fail: function() {
+                wx.hideLoading();
+                wx_paying=0;
                 "function" == typeof fail && fail();
             },
             failStatus: function() {
+                wx.hideLoading();
+                wx_paying=0;
                 "function" == typeof fail && fail();
             }
         });
@@ -35,9 +45,11 @@ module.exports = {
             signType: n.signType,
             paySign: n.paySign,
             success: function(n) {
+                wx_paying=0;
                 "function" == typeof succ && succ();
             },
             fail: function(n) {
+                wx_paying=0;
                 "function" == typeof fail && fail();
             }
         });