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

taiyuan
2 parents 76f5313a 762d8021
Showing 2 changed files with 40 additions and 6 deletions
pages/index/index/index.js
pages/index/index/index.wxml
@@ -439,7 +439,6 @@ Page({
 		});
-
   },
   //当隐藏的时候就关闭计时器
   onHide: function () {
@@ -937,10 +936,45 @@ Page({
     getApp().goto("/pages/goods/categoryList/categoryList");
   },
+  // 幸运购跳转
   go_url: function (e) {
-    var url = e.currentTarget.dataset.url;
-    getApp().goto(url);
-  },
+    var remark = e.currentTarget.dataset.remark;
+    // 不是标题
+    if (remark == 2) {
+      var app = getApp(),
+      os = app.globalData.setting,
+      oo = app.globalData;
+      // 进入幸运购活动前 判断是否有待支付订单
+      app.request.promiseGet('/api/weshop/prom/luckyOrder/page', {
+        data: {
+          store_id: os.stoid,
+          user_id: oo.user_id,
+          aid: e.currentTarget.dataset.aid,
+          pay_status: 0,
+        }
+      }).then(res => {
+          if(res.data.code == 0){
+            if (res.data.data.total > 0) {
+              // 待支付订单页面
+              getApp().goto('/pages/user/order_list/order_list?type=1');
+
+            } else {
+              var url = e.currentTarget.dataset.url;
+              getApp().goto(url);
+
+            }
+              
+          }
+      });
+
+    } else {
+      // 标题
+      var url = e.currentTarget.dataset.url;
+      getApp().goto(url);
+
+    }
+
+  }, //
   bind_bnerr_icon: function (e) {
     var def = "/miniapp/images/no_cate_def.png";
@@ -230,7 +230,7 @@
 	<!--幸运购-->
 		<view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}">
-			<navigator bindtap="go_url"  data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none">
+			<navigator bindtap="go_url" data-remark="1"  data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none">
 				<view class="seckill-time">
 					<view class="classname flex ai_c">
 						<i class="iconfont icon-luck"></i>
@@ -243,7 +243,7 @@
 				</view>
 			</navigator>
 			<view class=" luck">
-				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
+				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-aid="{{item.id}}" data-remark="2" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
 					<view class="flex ai-center">
 						<view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}"
 							data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view>