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

泉州测试
2 parents 09c4905f eed9f7a2
Showing 5 changed files with 38 additions and 18 deletions
components/goods_list/goods_list.js
components/goods_list/goods_list.wxml
pages/cart/cart2/ladder_calculate.js
pages/user/deposit/prepaid/prepaid.js
pages/user/order_list/order_list.js
@@ -207,5 +207,11 @@ Component({
         func(ob);
       })
     },
+
+      go_url:function (e) {
+          var url=e.currentTarget.dataset.url;
+          getApp().goto(url);
+      }
+
   },
 })
 \ No newline at end of file
@@ -5,10 +5,10 @@
   <view class="hang ">
     <!-- 商品详情 -->
  
-    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{get_url_by_type(item)}}">
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{g_filter.get_url_by_type(item)}}">
     <!--<view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">-->
       <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> -->
-			<navigator url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}" hover-class="none">
+			<navigator  hover-class="none">
         <!-- 商品图⽚ -->
         <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
         <view class="bottom">
@@ -49,6 +49,11 @@ module.exports = {
                 del_g.push(item);
             }
  
+            function sortData(a, b) {
+                return a.price - b.price
+            }
+            no_in_arr.sort(sortData);
+
             //开始阶梯计算价格
             var lev = 0;
             for (let j in ladder_list) {
@@ -125,7 +125,16 @@ Page({
           }
         }).then(res => {
              console.log(res);
-
+             var getcode=res.data.code;
+             if (getcode!=0)
+             {
+               wx.showModal({
+                 title: '提示',
+                 content:res.data.msg
+             });
+             return false;
+             }
+ 
  
           var msg = res.data.data;
           var parentSn = msg.order_sn;
@@ -1230,19 +1230,19 @@ Page({
             })
  
             //调用接口判断订单优惠，
-            const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {})
-            if (res.data.code == 0 && res.data.data) {
-                var r_data = res.data.data;
-                if (r_data.ladderLists) {
-                    var act_id = r_data.ladderLists[0].form_id;
-                    //-- 判断会员能不能参与阶梯促销 --
-                    const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {})
-                    if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) {
-                        b_item.prom_type = 10;
-                        b_item.prom_id = data.data.data.id;
-                    }
-                }
-            }
+            // const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {})
+            // if (res.data.code == 0 && res.data.data) {
+            //     var r_data = res.data.data;
+            //     if (r_data.ladderLists) {
+            //         var act_id = r_data.ladderLists[0].form_id;
+            //         //-- 判断会员能不能参与阶梯促销 --
+            //         const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {})
+            //         if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) {
+            //             b_item.prom_type = 10;
+            //             b_item.prom_id = data.data.data.id;
+            //         }
+            //     }
+            // }
             if(!good){
                 err_text+= g_item['goods_name']+"未找到商品\n";
                 continue;
@@ -1357,7 +1357,6 @@ Page({
                         })
                         break;
                         case 10:
-                            
                             let user_id = getApp().globalData.userInfo.user_id;
                             var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`;
                             await getApp().request.promiseGet(url, {}).then(res => {
@@ -1707,7 +1706,8 @@ Page({
 		      store_id: os.stoid,
 		      user_id: oo.user_id,
 		      goods_id: g_item.goods_id,
-		      pick_id: g_item.pickup_id,
+              pick_id: g_item.pickup_id,
+              state:0,
 		    },
 		  }).then(res=>{
 			  //-------如果购物车中有相关的数据-------