Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

pages/margin/margin.vue

@@ -40,7 +40,7 @@
 		<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
 			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 		</view>
-		
+
 	</view>
 </template>
 
@@ -98,7 +98,7 @@
 						that.$set(that, 'productList', productList);
 					}, 500)
 
-				
+
 					that.$set(that.where, 'page', that.where.page + 1);
 					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
 				}).catch(err => {
@@ -112,55 +112,55 @@
 				merchant({
 					id: this.mer_id
 				}).then((res) => {
-					
+
 					this.merchant_Data = res.data
 				});
 			},
 			//缴纳保证金
 			paydecimal() {
-			
-					let that = this
-					uni.showModal({
-						title: '提示',
-						content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
-						success: (res) => {
-							if (res.confirm) {
 
-								// console.log('用户点击确定');
+				let that = this
-								paymerchant().then((res) => {
+				uni.showModal({
+					title: '提示',
+					content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
+					success: (res) => {
+						if (res.confirm) {
 
-									uni.requestPayment({
+							// console.log('用户点击确定');
-										provider: 'wxpay',
+							paymerchant().then((res) => {
-										orderInfo: res.data
-											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-										success: (res) => {
-											that.$util.Tips({
-												title: '支付成功'
-											});
-											that.decimal()
-											that.list(true)
-										},
-										fail: (err) => {
-											that.$util.Tips({
-												title: '支付失败'
-											});
 
-											console.log('fail:' + JSON.stringify(err));
+								uni.requestPayment({
-										}
+									provider: 'wxpay',
-									});
+									orderInfo: res.data
-								}).catch((err) => {
+										.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-									console.log(err)
+									success: (res) => {
-									this.$util.Tips(()=>{
+										that.$util.Tips({
-										
+											title: '支付成功'
-									})
+										});
-								})
+										that.decimal()
-							} else if (res.cancel) {
+										that.list(true)
-								console.log('用户点击取消');
+									},
-							}
+									fail: (err) => {
+										that.$util.Tips({
+											title: '支付失败'
+										});
+
+										console.log('fail:' + JSON.stringify(err));
+									}
+								});
+							}).catch((err) => {
+								console.log(err)
+								that.$util.Tips({
+											title: err
+										})
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
 						}
-					});
+					}
+				});
 
-				}
+			}
 
 		}
 	}

pages/moreProject/moreProject.vue

@@ -54,6 +54,7 @@
 							<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
 							<text class="text">订单管理</text>
 						</view> -->
+						
 							<view class="examine"
 								@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
 								<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
@@ -83,7 +84,7 @@
 								</image>
 								<text class="text">订单核销</text>
 							</view>
-							<view class="examine" @click="navigator(`/pages/margin/margin`)">
+							<view class="examine" @click="margin(`/pages/margin/margin`)">
 								<image class="icon_img" src="@/static/images/jy.png">
 								</image>
 								<text class="text">缴纳保证金</text>
@@ -323,7 +324,7 @@
 									<text class="text">商户设置</text>
 								</view>
 
-								<view class="examine" @click="navigator(`/pages/margin/margin`)">
+								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
 									<text class="text">缴纳保证金</text>
@@ -394,7 +395,7 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-								<view class="examine" @click="navigator(`/pages/margin/margin`)">
+								<view class="examine" @click="margin(`/pages/margin/margin`)">
 									<image class="icon_img" src="@/static/images/jy.png">
 									</image>
 									<text class="text">缴纳保证金</text>
@@ -886,10 +887,7 @@
 				})
 			},
 			navigator(url, t) {
-
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-
-
 					if (this.codenote.length == 0) {
 						this.isFshow = true
 						this.countDown()
@@ -904,7 +902,6 @@
 						}
 					}
 				} else {
-
 					uni.navigateTo({
 						url: url
 					})