预售的修改

yvan.ni
1 parent a370d132
Showing 7 changed files with 47 additions and 28 deletions
components/diy_pregoods/diy_pregoods.js
components/diy_pregoods/diy_pregoods.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/list/list.js
utils/request.js
@@ -37,7 +37,7 @@ Component({
 				+os.stoid+"&goodsidlist="+goodsidlist, {
 			  	 data:{is_end:0,timetype:1,isuse:1}
 			  }).then(res => {
-				//如果秒杀的数组为空的时候    
+				//如果数组为空的时候
 				var goodslist=res.data.data;
 				//就算是添加的活动已经过期，就要用最新的进行中活动
 				if(goodslist && goodslist.length>0) {
@@ -52,7 +52,7 @@ Component({
 	//当是默认的情况
 	no_gid_set(){
 		getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page",
-		  {isShowLoading:1,data:{store_id:os.stoid,is_end:0,timetype:1,page:1,pageSize:9 }}
+		  {isShowLoading:1,data:{store_id:os.stoid,is_end:0,timetype:1,page:1,pageSize:9,isuse:1}}
 		).then(res=>{
 		  if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0)	{
 			   var goodsidlist=res.data.data.pageData; 
@@ -15,7 +15,7 @@
     <view class='sp' wx:if="{{object.style==1}}">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+          <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}" class="s1_gk_a1">
             <view class='one'>
               <view class='sp_top'>
                 <view class='po'></view>
@@ -77,7 +77,7 @@
   <view class="sp2" wx:if="{{object.style==2}}">
     <block wx:for="{{goods_array}}">
       <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+        <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&pre_id={{aitem.id}}" class="s1_gk_a1">
           <view class='one1'>
             <view class="o1_img">
@@ -575,9 +575,8 @@ Page({
         if(th.data.wait_fh){
              var send_time=th.data.act.delivery_date;
              if(th.data.act.delivery_type==2){
-                 send_time=th.data.act.delivery_daynum*3600;
+                 send_time=ut.gettimestamp()+th.data.act.delivery_daynum*3600*24;
              }
-
         }
         order.order_goods = order_goods;
@@ -26,7 +26,7 @@
                 </view>
-                <view wx:if="{{wait_sh}}">
+                <view wx:if="{{wait_sh && !wait_fh}}">
                     <view>等待收货</view>
                     <view>{{order.order_sn}}</view>
                 </view>
@@ -331,8 +331,8 @@
     <!-- 要支付尾款的时候 -->
     <view class="fixedToBottom shadow-1" wx:if="{{wait_wk}}">
-        <view wx:if="{{no_start}}" class="date-container">尾款时间{{filters.format_time(presell.kw_start_time,1)}} -
-            {{filters.format_time(presell.kw_end_time,1)}}
+        <view wx:if="{{no_start}}" class="date-container">尾款时间{{filters.format_time(act.pay_begindate,1)}} -
+            {{filters.format_time(act.pay_enddate,1)}}
         </view>
         <view wx:elif="{{is_end}}" class="date-container">尾款时间已经结束</view>
         <view wx:elif="{{wait_wk && !no_start}}" class="date-container">
@@ -355,7 +355,7 @@
     <view class="fixedToBottom shadow-1" wx:else style="background-color: #fff;display: flex; justify-content: flex-end; padding: 10rpx 0">
         <view  bindtap="cancelOrder"  data-id="{{order.order_id}}" class="tips-btn2" wx:if="{{wait_dj}}">取消订单</view>
         <view bindtap="jumpToCart4" class="tips-btn2" wx:if="{{wait_dj}}">立即付款</view>
-        <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4)}}">
+        <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4) && wait_sh && !wait_fh  }}">
             <navigator bindtap="confirmOrder" class="tips-btn2" hidden="{{!wait_sh}}">收货确认</navigator>
         </block>
@@ -1263,6 +1263,7 @@ Page({
   //判断是不是优惠促销
   check_is_prom_goods: function (callback) {
+    if(!this.data.sele_g) return false;
     var th = this;
     var usr = getApp().globalData.userInfo;
     if (this.data.sele_g.prom_type != 0 && this.data.sele_g.prom_type != 3) {
@@ -1607,18 +1608,24 @@ Page({
   async get_sku(stoid, gd, g_id, is_normal, func) {
     var tt = this, arrdata = null;
     var now = ut.gettimestamp();
-    await getApp().request.promiseGet("/api/weshop/goods/page", {
-      data: {
-        store_id: o.stoid,
-        sku: gd.sku,
-        more_spec: gd.more_spec,
-        isonsale: 1,
-        is_on_sale: 1,
-        pageSize: 500,
-        orderField: 'sort',
-        prom_id: tt.data.presellForm.id,
-        prom_type: 8,
+
+     var rq_data={
+          store_id: o.stoid,
+              sku: gd.sku,
+              more_spec: gd.more_spec,
+              isonsale: 1,
+              is_on_sale: 1,
+              pageSize: 500,
+              orderField: 'sort',
+              prom_type: 8,
+      };
+
+     if(tt.data.presellForm && tt.data.presellForm.id){
+         rq_data.prom_id=tt.data.presellForm.id;
       }
+
+    await getApp().request.promiseGet("/api/weshop/goods/page", {
+      data: rq_data
     }).then(res => {
       var e = res;
       if (e.data.code == 0) arrdata = e.data.data.pageData;
@@ -2186,7 +2193,7 @@ Page({
     var e = this, th = e, ee = e; var tp = e.data.activeCategoryId3;
     var t = '/api/weshop/comment/pageComment?page=' + e.data.c_curr_p;
-    wx.showLoading();
+    //wx.showLoading();
     var req_where = {
       store_id: o.stoid, pageSize: 5, is_show: 1,
       parent_id: 0, goods_id: th.data.gid, commenttype: tp,
@@ -2245,7 +2252,7 @@ Page({
       th.setData({ comments: com_data });
     }
     th.setData({ get_c: 1 });
-    wx.hideLoading();
+    //wx.hideLoading();
   },
   //加载更多是靠这个函数
@@ -3914,6 +3921,8 @@ Page({
             ut.wx_back();
             return false;
         }
+
+        var gnext=1;
         //------获取预售主表----------
         await getApp().request.promiseGet(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, {}).then(res => {
             if (res.data.code == 0 && res.data.data) {
@@ -3922,14 +3931,16 @@ Page({
                     wx.showToast({title: "活动已经结束", icon: 'none', duration: 3000});
                     setTimeout(function () {
                         ut.wx_back();
-                    }, 1100)
+                    }, 2000)
+                    gnext=0;
                     return false;
                 }
                 if (act_data.isuse == 0) {
                     wx.showToast({title: "活动未启用", icon: 'none', duration: 3000});
                     setTimeout(function () {
                         ut.wx_back();
-                    }, 1100)
+                    }, 2000)
+                    gnext=0;
                     return false;
                 }
@@ -3943,7 +3954,8 @@ Page({
                     wx.showToast({title:err_txt, icon: 'none', duration: 3000});
                     setTimeout(function () {
                         ut.wx_back();
-                    }, 1100)
+                    }, 2000)
+                    gnext=0;
                     return false;
                 }
@@ -3953,6 +3965,13 @@ Page({
                 th.countDown(res.data.data.end_time)
             }
         })
+
+
+        if(!gnext){
+           return false;
+        }
+
+
         var userInfo = getApp().globalData.userInfo;
         var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id};
         if (userInfo) {
@@ -117,7 +117,8 @@ Page({
             store_id: os.stoid,
             page: this.data.page,
             pageSize: 10,
-            timetype: 1
+            timetype: 1,
+            isuse:1
         }
         if(getApp().globalData.userInfo){
             req.user_id=getApp().globalData.userInfo.user_id;
@@ -7,7 +7,7 @@ module.exports = {
           "content-type": "application/x-www-form-urlencoded"
           //"content-type": "application/texts"         
         }, s = "GET" != (e = e.toUpperCase()) && o.data ? t.json2Form(o.data) : o.data;
-        i = this.modifyUrl(i, o), o.isShowLoading = void 0 === o.isShowLoading || o.isShowLoading, 
+        i = this.modifyUrl(i, o),
         o.isShowLoading && this.showLoading();
         var req=wx.request(Object.assign({}, o, {
             url: i,