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

pages/margin/margin.vue

@@ -150,8 +150,8 @@
 								});
 							}).catch((err) => {
 								console.log(err)
-									this.$util.Tips(()=>{
-										
+								that.$util.Tips({
+											title: err
 										})
 							})
 						} else if (res.cancel) {

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
 					})