mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
weipengfei 2023-09-28 17:03:04 +08:00
commit 25a31e754c
3 changed files with 1681 additions and 1563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/margin/margin.vue
View File

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

11
pages/moreProject/moreProject.vue
View File

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

1065
pages/nongKe/cloud_entrepot/index.vue
View File

File diff suppressed because it is too large Load Diff