Merge branch '促销活动购物车' into preview

packageA/activity/detail.js

@@ -178,7 +178,7 @@ Page({
 				}
 			}),
 		});
-		// getApp().globalData.handleSelect = this.creadedOrderForm.bind(this);
+		getApp().globalData.handleSelect = this.creadedOrderForm.bind(this);
 	},
 	creadedOrderForm({
 		list
@@ -188,7 +188,11 @@ Page({
 			title: '提示',
 			content: '是否确定创建促销订单?',
 			complete: (res) => {
-				if (res.confirm)
+				if (res.confirm) {
+					wx.showLoading({
+						title: '生成中...',
+						mask: true
+					})
 					_Http.basic({
 						"id": 20221128183202,
 						"content": {
@@ -217,6 +221,7 @@ Page({
 							})
 						}
 					}).then(res => {
+						wx.hideLoading()
 						console.log("转化促销订单", res)
 						wx.showToast({
 							title: res.msg != '成功' ? res.msg : '创建成功',
@@ -228,6 +233,8 @@ Page({
 							});
 						}, 300)
 					})
+				}
+
 			}
 		})
 	},

packageA/activity/selectProduct/cart/footer.wxml

@@ -9,4 +9,7 @@
 	<view hover-class="{{disabled?'none':'navigator-hover'}}" style="background: rgba({{disabled?'243,123,29,.7':'243,123,29,1'}});color: #fff;" class="submit" data-event="update" bindtap="{{disabled?'':'clickBut'}}">
 		加入促销购物车
 	</view>
+	<view hover-class="{{disabled?'none':'navigator-hover'}}" style="background: rgba({{disabled?'8,92,223,.7':'8,92,223,1'}});color: #fff;" class="submit" data-event="submit" bindtap="{{disabled?'':'clickBut'}}">
+		生成订单
+	</view>
 </view>

packageA/activity/selectProduct/cart/index.wxml

@@ -31,7 +31,7 @@
 				<view class="check label-class">
 					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}
 				</view>
-				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
+				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>
 		</view>
 		<view slot="right" class="cell-right">删 除</view>

packageA/activity/selectProduct/index.js

@@ -62,6 +62,8 @@ Page({
           })
         }`,
       })
+    } else if (detail == "submit") {
+      this.submit()
     } else {
       _Http.basic({
         "id": 20231024110003,

packageA/activity/selectProduct/index.wxml

@@ -33,7 +33,7 @@
 						起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}
 					</view>
 				</view>
-				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" max="{{item.maxQty||'99999999'}}" disabled="{{item.groupqty!=0 && item.maxQty<=0}}" step="{{item.orderaddqty}}" input-class='input-class' data-index="{{index}}" data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
+				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" max="{{item.maxQty||'99999999'}}" disabled="{{item.groupqty!=0 && item.maxQty<=0}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
 			</view>
 	</navigator>
 	<view style="height: 100rpx;" />

pages/index/collect/index.wxml

@@ -30,7 +30,7 @@
 				<view class="check label-class">
 					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}
 				</view>
-				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
+				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>
 		</view>
 		<view slot="right" class="cell-right">删 除</view>

select/product/index.wxml

@@ -48,7 +48,7 @@
                     起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装量:{{item.packageqty}}
                 </view>
             </view>
-            <van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty}}" input-class='input-class' data-index="{{index}}" data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
+            <van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
         </view>
     </view>
     <view wx:if="{{!radio}}" style="height: 130rpx;" />