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

更新

Browse Source
This commit is contained in:
weipengfei 2023-10-26 18:43:31 +08:00
parent 1415912ff7
commit 62f64fff63
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/api.js
View File

@ -293,20 +293,20 @@ export function brigade(data) {
} }
/* /*
生产 -- 获取商户保证金信息支付接口 生产 -- 获取商户押金信息支付接口
*/ */
export function paymerchant() { export function paymerchant() {
return request.post(`user/margin`,{}); return request.post(`user/margin`,{});
} }
/* /*
生产 -- 获取商户保证金信息接口 生产 -- 获取商户押金信息接口
*/ */
export function merchant(data) { export function merchant(data) {
return request.get(`store/merchant/margin`, data); return request.get(`store/merchant/margin`, data);
} }
//获取保证金缴纳列表 //获取押金缴纳列表
export function marginlist(data) { export function marginlist(data) {
return request.get(`user/margin/list`,data); return request.get(`user/margin/list`,data);
} }

2
pages.json
View File

@ -151,7 +151,7 @@
"path" : "pages/margin/margin", "path" : "pages/margin/margin",
"style" : "style" :
{ {
"navigationBarTitleText":"缴纳保证金", "navigationBarTitleText":"缴纳押金",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }

2
pages/admin/financial_management/index.vue
View File

@ -54,7 +54,7 @@
</view> </view>
<view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')"> <view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
<view class="item"> <view class="item">
<view>履约保证金额(元)</view> <view>履约押金额(元)</view>
<view class="num" v-show="eyeType">{{ <view class="num" v-show="eyeType">{{
userInfo.deposit || 0.0 userInfo.deposit || 0.0
}}</view> }}</view>

12
pages/margin/margin.vue
View File

@ -3,13 +3,13 @@
<view class="info"> <view class="info">
<view class="bg"></view> <view class="bg"></view>
<view class="card"> <view class="card">
<view class="title">店铺保证金信息</view> <view class="title">店铺押金信息</view>
<view class="item"> <view class="item">
<text>已缴纳保证金</text> <text>已缴纳押金</text>
<text>{{merchant_Data.paid_margin}}</text> <text>{{merchant_Data.paid_margin}}</text>
</view> </view>
<view class="item"> <view class="item">
<text>剩余缴纳保证金</text> <text>剩余缴纳押金</text>
<text>{{merchant_Data.unpaid_margin}}</text> <text>{{merchant_Data.unpaid_margin}}</text>
</view> </view>
<view class="item"> <view class="item">
@ -107,7 +107,7 @@
}); });
}, },
//获取保证金信息 //获取押金信息
decimal() { decimal() {
merchant({ merchant({
id: this.mer_id id: this.mer_id
@ -115,12 +115,12 @@
this.merchant_Data = res.data this.merchant_Data = res.data
}); });
}, },
//缴纳保证金 //缴纳押金
paydecimal() { paydecimal() {
let that = this let that = this
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金', content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳押金',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
paymerchant().then((res) => { paymerchant().then((res) => {

10
pages/moreProject/moreProject.vue
View File

@ -87,7 +87,7 @@
<view class="examine" @click="margin(`/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>
</view> </view>
<!-- <view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
@ -203,7 +203,7 @@
<view class="examine" @click="margin(`/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>
</view> </view>
<!-- <view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)"> @click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
@ -327,7 +327,7 @@
<view class="examine" @click="margin(`/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>
</view> </view>
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)"> <!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
@ -398,7 +398,7 @@
<view class="examine" @click="margin(`/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>
</view> </view>
</view> </view>
</view> </view>
@ -848,7 +848,7 @@
} }
}, },
//保证金缴纳 //押金缴纳
margin(url) { margin(url) {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {

18
pages/store/entryProcess/entryProcess.vue
View File

@ -39,14 +39,14 @@
<view class="record flex"> <view class="record flex">
<view class="circle"></view> <view class="circle"></view>
<view class="cont-box"> <view class="cont-box">
<view class="title">签署里海云《履约保证金协议》</view> <view class="title">签署里海云《履约押金协议》</view>
<view class="text-box"> <view class="text-box">
<view class="have-filled" v-if="false"> <view class="have-filled" v-if="false">
<text>1.完成签署履约保证金协议2023-05-08 13:15完成</text> <text>1.完成签署履约押金协议2023-05-08 13:15完成</text>
</view> </view>
<view class="get-through" v-else> <view class="get-through" v-else>
<text class="through-title">1、签署里海云《履约保证金协议》</text> <text class="through-title">1、签署里海云《履约押金协议》</text>
<text>请详细阅读里海云履约保证金协议，并充分理解内容后进行电子签名。</text> <text>请详细阅读里海云履约押金协议，并充分理解内容后进行电子签名。</text>
<view class="flex_a_c" style="margin-top: auto;"> <view class="flex_a_c" style="margin-top: auto;">
<view class="through-btn">签署协议</view> <view class="through-btn">签署协议</view>
<view class="tiaoguo">跳过</view> <view class="tiaoguo">跳过</view>
@ -58,16 +58,16 @@
<view class="record flex"> <view class="record flex">
<view class="circle"></view> <view class="circle"></view>
<view class="cont-box"> <view class="cont-box">
<view class="title">缴纳履约保证金</view> <view class="title">缴纳履约押金</view>
<view class="text-box"> <view class="text-box">
<view class="have-filled" v-if="!true"> <view class="have-filled" v-if="!true">
<text>1.完成履约保证金缴纳 2023-05-08 13:15完成</text> <text>1.完成履约押金缴纳 2023-05-08 13:15完成</text>
</view> </view>
<view class="get-through" v-else> <view class="get-through" v-else>
<text class="through-title">1、缴纳履约保证金</text> <text class="through-title">1、缴纳履约押金</text>
<text>线上缴纳履约保证金，完成保证金审核后签约完成。</text> <text>线上缴纳履约押金，完成押金审核后签约完成。</text>
<view class="flex_a_c" style="margin-top: auto;"> <view class="flex_a_c" style="margin-top: auto;">
<view class="through-btn">缴纳履约保证金</view> <view class="through-btn">缴纳履约押金</view>
<view class="tiaoguo">跳过</view> <view class="tiaoguo">跳过</view>
</view> </view>
</view> </view>