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

WXD-SEASON\season
2 parents e898473c bd037a68
Showing 8 changed files with 20 additions and 12 deletions
packageA/pages/distribution/shop/shop.js
packageB/pages/zuhegou/index/index.wxml
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
packageC/pages/presell/cart/cart.wxml
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/public/buy_com.js
pages/user/order_detail/order_detail.wxml
pages/user/plus/plus.js
@@ -39,6 +39,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
+    console.log("-- shop：load --");
+    console.log(options);
+
     wx.setNavigationBarTitle({
       title: "我的小店",
     });
@@ -50,8 +54,12 @@ Page({
       });
     });
     //从别人的分享的跳转过来
-    var first_leader = decodeURIComponent(options.scene);
+    var first_leader = decodeURIComponent(options.first_leader);
     if (first_leader && first_leader != 'undefined') {
+
+      console.log("-- shop：load2 --");
+      console.log("-- shop：load3 --"+first_leader);
+
       getApp().globalData.first_leader = first_leader;
       this.data.first_leader = first_leader;
@@ -357,8 +365,7 @@ Page({
     }
     var ob = {
-      title: title,
-      path: url,
+      title: title,path: url,
     };
     return ob;
@@ -16,7 +16,7 @@
     </view>
-    <view class="c_w mt20 fs28">门店:
+    <view class="c_w mt20 fs28">选择门店:
        <block  wx:if="{{def_pick_store}}">
            <text wx:if="{{all_price>0}}">{{def_pick_store.pickup_name}}</text>
            <text wx:else  bindtap="choose_store">{{def_pick_store.pickup_name}}</text>
@@ -205,7 +205,7 @@
             <navigator wx:if="{{order.order_goods.length>1}}"  class="tips-btn"
                        url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
             <navigator wx:else  class="tips-btn"
-                       url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
+                       url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}">去评价</navigator>
         </block>
     </view>
@@ -412,7 +412,7 @@
         <block wx:if="{{order.order_status==2 }}">
-            <navigator  class="tips-btn2" url="/packageB/pages/user/add_comment/add_comment?goods_id={{order_goods.goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
+            <navigator  class="tips-btn2" url="/packageB/pages/user/add_comment/add_comment?goods_id={{order_goods.goods_id}}&order_id={{order.order_id}}">去评价</navigator>
         </block>
     </view>
@@ -179,7 +179,7 @@ Page({
             }
             this.init();
         })
-        th.setData({ submit:0})
+        this.setData({ submit:0})
     },
     GetBuyPrice: function (e) {
         var that = this.data;
@@ -190,9 +190,6 @@ Page({
             return false;
         }
-        if(th.data.submit)  return false;
-        th.setData({submit:1})
-
         this.data.payMoney = th.data.sele_g.payMoney;
         th.setData({buyType: 2})
@@ -201,6 +198,7 @@ Page({
                 openSpecModal: 1
             })
         } else {
+
             var my_confirm = th.selectComponent("#my_confirm"); //组件的id
             my_confirm.open(
                 "是否确定购买该礼包",
@@ -210,6 +208,7 @@ Page({
                     my_confirm.open_cancel(0);
                 },
                 function () {
+
                     my_confirm.open_cancel(0);
                     com.buy_libao(th)
                 }
@@ -214,7 +214,9 @@ module.exports = {
             }
         }
+        if(th.data.submit) return false;
         th.setData({submit:1})
+
         var id=th.data.sele_g.lbId;
         var that=th;
         var json = {
@@ -194,7 +194,7 @@
             <navigator wx:if="{{order.order_goods.length>1}}"  class="tips-btn"
                        url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
             <navigator wx:else  class="tips-btn"
-                       url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
+                       url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}">去评价</navigator>
         </block>
 		<!-- 积分购  拼团 搭配购没有有再来一单 -->
 		<block wx:if="{{ (order.pay_status==1 || order.order_status==3) && order.pt_prom_id<=0 && order.integral<=0 && order.order_goods[0].prom_type!=5}}">
@@ -129,7 +129,7 @@ Page({
     if (!user_info) return false;
     ut.fy_back('',0);
-    th.setData({
+    this.setData({
        is_select:0,
        focus:true,
     })