From 7252664e769432b943f1948a01819f13f5443d57 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 14 Jun 2023 09:12:11 +0800
Subject: [PATCH] 1、起订量和倍数 2、虚拟商品

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml            |  2 +-
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   |  5 +++--
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |  2 ++
 pages/activity/pind_list/pind_list.js                           | 15 +++++++++++----
 pages/activity/seckill_list/seckill_list.js                     |  9 ++++++++-
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 3b02402..38120f6 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -122,7 +122,7 @@
           <view class="count">
             <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
             <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}" disabled></input>
-            <view bindtap="" class="sub active">+</view>
+            <view bindtap="addCartNum" class="sub active">+</view>
           </view>
         </view>
 		
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 540fef7..99d8f2e 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -1046,7 +1046,7 @@ Page({
 
           //-- 把商品的赋值 --
           ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
-          if (ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6)
+          if (ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 9)
             ee.check_is_youhui(ee.data.gid);
 
           t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
@@ -4452,7 +4452,8 @@ Page({
             th.get_sto();
             th.setData({
               is_normal: 0,
-              openSpecModal_pt: 1
+              openSpecModal_pt: 1,
+              goodsInputNum:1
             });
 
           }
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index aabdb7f..5ae7c5c 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -1062,6 +1062,7 @@
             </view>
           </view>
           <block wx:if="{{prom_type == 0}}">
+            11111111111111
             <view class="flex">
               <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
               <!-- 线下门店销售的时候 -->
@@ -1081,6 +1082,7 @@
             </view>
           </block>
           <block wx:if="{{prom_type==1}}">
+            555555555555
             <view class="flex">
               <view class="spec-goods-stock" wx:if="{{prom_st>0}}">
                 已售：{{prom_act.buy_num+prom_act.virtual}}
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index ede6461..103b15d 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -149,8 +149,11 @@ Page({
     var plist = [],
       alllist = th.data.goodlist;
     if (!alllist) alllist = [];
+
+
+    wx.showLoading();
     await getApp().request.promiseGet(i, {
-      isShowLoading: 1,
+      isShowLoading: 0,
       data: {
         store_id: os.stoid,
         is_end: 0,
@@ -162,6 +165,8 @@ Page({
     });
 
     if (plist.length <= 0) {
+
+      wx.hideLoading();
       getApp().showWarning("没有更多数据");
       th.data.ismore = 0;
 
@@ -186,9 +191,6 @@ Page({
           }
         });
 
-
-
-
         // if(plist){
         //   setTimeout(function () {
         //     th.data.ismore = 1;
@@ -224,6 +226,11 @@ Page({
       isshow: 1,
       is_get:1,
     });
+
+    setTimeout(()=>{
+      wx.hideLoading();
+    },400)
+
   },
 
   onPullDownRefresh: function () {
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index fecefef..c4523b5 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -175,8 +175,10 @@ Page({
       user_id: user_id
     };
 
+    wx.showLoading();
+
     await getApp().request.promiseGet(i, {
-      isShowLoading: 1,
+      isShowLoading: 0,
       data: req
     }).then(res => {
       if (ut.ajax_ok(res)) plist = res.data.data.pageData;
@@ -185,6 +187,7 @@ Page({
 
     if (!plist || plist.length <= 0) {
 
+      wx.hideLoading();
       getApp().showWarning("没有更多数据");
       th.data.ismore = 0;
       if (e.data.currentPage == 1 && this.data.type == 1) {
@@ -221,6 +224,10 @@ Page({
       isshow: 1
     });
 
+    setTimeout(()=>{
+      wx.hideLoading();
+    },400)
+
 
 
   },
--
libgit2 0.21.4