Commit 7252664e769432b943f1948a01819f13f5443d57

Authored by yvan.ni
1 parent 7981fd58

1、起订量和倍数

2、虚拟商品
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
... ... @@ -122,7 +122,7 @@
122 122 <view class="count">
123 123 <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
124 124 <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}" disabled></input>
125   - <view bindtap="" class="sub active">+</view>
  125 + <view bindtap="addCartNum" class="sub active">+</view>
126 126 </view>
127 127 </view>
128 128  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
... ... @@ -1046,7 +1046,7 @@ Page({
1046 1046  
1047 1047 //-- 把商品的赋值 --
1048 1048 ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
1049   - if (ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6)
  1049 + if (ee.data.prom_type != 1 && ee.data.prom_type != 4 && ee.data.prom_type != 6 && ee.data.prom_type != 9)
1050 1050 ee.check_is_youhui(ee.data.gid);
1051 1051  
1052 1052 t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
... ... @@ -4452,7 +4452,8 @@ Page({
4452 4452 th.get_sto();
4453 4453 th.setData({
4454 4454 is_normal: 0,
4455   - openSpecModal_pt: 1
  4455 + openSpecModal_pt: 1,
  4456 + goodsInputNum:1
4456 4457 });
4457 4458  
4458 4459 }
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
... ... @@ -1062,6 +1062,7 @@
1062 1062 </view>
1063 1063 </view>
1064 1064 <block wx:if="{{prom_type == 0}}">
  1065 + 11111111111111
1065 1066 <view class="flex">
1066 1067 <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view>
1067 1068 <!-- 线下门店销售的时候 -->
... ... @@ -1081,6 +1082,7 @@
1081 1082 </view>
1082 1083 </block>
1083 1084 <block wx:if="{{prom_type==1}}">
  1085 + 555555555555
1084 1086 <view class="flex">
1085 1087 <view class="spec-goods-stock" wx:if="{{prom_st>0}}">
1086 1088 已售:{{prom_act.buy_num+prom_act.virtual}}
... ...
pages/activity/pind_list/pind_list.js
... ... @@ -149,8 +149,11 @@ Page({
149 149 var plist = [],
150 150 alllist = th.data.goodlist;
151 151 if (!alllist) alllist = [];
  152 +
  153 +
  154 + wx.showLoading();
152 155 await getApp().request.promiseGet(i, {
153   - isShowLoading: 1,
  156 + isShowLoading: 0,
154 157 data: {
155 158 store_id: os.stoid,
156 159 is_end: 0,
... ... @@ -162,6 +165,8 @@ Page({
162 165 });
163 166  
164 167 if (plist.length <= 0) {
  168 +
  169 + wx.hideLoading();
165 170 getApp().showWarning("没有更多数据");
166 171 th.data.ismore = 0;
167 172  
... ... @@ -186,9 +191,6 @@ Page({
186 191 }
187 192 });
188 193  
189   -
190   -
191   -
192 194 // if(plist){
193 195 // setTimeout(function () {
194 196 // th.data.ismore = 1;
... ... @@ -224,6 +226,11 @@ Page({
224 226 isshow: 1,
225 227 is_get:1,
226 228 });
  229 +
  230 + setTimeout(()=>{
  231 + wx.hideLoading();
  232 + },400)
  233 +
227 234 },
228 235  
229 236 onPullDownRefresh: function () {
... ...
pages/activity/seckill_list/seckill_list.js
... ... @@ -175,8 +175,10 @@ Page({
175 175 user_id: user_id
176 176 };
177 177  
  178 + wx.showLoading();
  179 +
178 180 await getApp().request.promiseGet(i, {
179   - isShowLoading: 1,
  181 + isShowLoading: 0,
180 182 data: req
181 183 }).then(res => {
182 184 if (ut.ajax_ok(res)) plist = res.data.data.pageData;
... ... @@ -185,6 +187,7 @@ Page({
185 187  
186 188 if (!plist || plist.length <= 0) {
187 189  
  190 + wx.hideLoading();
188 191 getApp().showWarning("没有更多数据");
189 192 th.data.ismore = 0;
190 193 if (e.data.currentPage == 1 && this.data.type == 1) {
... ... @@ -221,6 +224,10 @@ Page({
221 224 isshow: 1
222 225 });
223 226  
  227 + setTimeout(()=>{
  228 + wx.hideLoading();
  229 + },400)
  230 +
224 231  
225 232  
226 233 },
... ...