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

taiyuan
2 parents 0946a240 cf581ced
Showing 1 changed file with 2 additions and 34 deletions
pages/index/index/index.js
@@ -938,41 +938,9 @@ Page({
   // 幸运购跳转
   go_url: function (e) {
-    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);
-
-    }
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
   }, //