faiz
/
hy-shop-mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-04-24 16:54:03 +08:00
parent 9c5cae8528
commit 5633ca41e7
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/notice.js
View File

@ -2,6 +2,7 @@
import SettingMer from '@/libs/settingMer' import SettingMer from '@/libs/settingMer'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import router from '../router' import router from '../router'
import store from '@/store'
import { roterPre } from '@/settings' import { roterPre } from '@/settings'
import Vue from 'vue' import Vue from 'vue'
@ -44,6 +45,15 @@ function notice(token) {
if (data.status === 200) { if (data.status === 200) {
vm.$emit(data.data.status, data.data.result) vm.$emit(data.data.status, data.data.result)
} }
console.log(data);
if (data.data.type === 'account_change') {
setTimeout(async () => {
await store.dispatch("user/logout");
router.push(
`${roterPre}/login`
);
}, 150);
}
if (data.type === 'notice') { if (data.type === 'notice') {
const h = vm.$createElement const h = vm.$createElement
ElementUI.Notification({ ElementUI.Notification({

36
src/views/systemForm/setSystem/modifyStoreInfo.vue
View File

@ -56,7 +56,7 @@
<!--未支付--> <!--未支付-->
<div v-if="merData.is_margin == 1"> <div v-if="merData.is_margin == 1">
<span class="basic-label">店铺保证金：</span> <span class="basic-label">店铺保证金：</span>
<span class="font_red">{{ merData.margin }}元</span> <span class="font_red">{{ marginNumber }}元</span>
<div class="margin_count" @mouseenter="getCode('all')"> <div class="margin_count" @mouseenter="getCode('all')">
<el-button type="text" size="small" class="mr10 pay_btn">去支付保证金</el-button> <el-button type="text" size="small" class="mr10 pay_btn">去支付保证金</el-button>
<!--支付二维码--> <!--支付二维码-->
@ -74,7 +74,7 @@
<div> <div>
<!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> --> <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
<!-- <div class="pay_type">请使用微信扫码支付</div> --> <!-- <div class="pay_type">请使用微信扫码支付</div> -->
<div class="pay_price">￥{{ merData.margin }}元</div> <div class="pay_price">￥{{ marginNumber }}元</div>
<div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div> <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
<div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div> <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
<div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div> <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
@ -86,7 +86,7 @@
<!--技术服务费--> <!--技术服务费-->
<div v-if="merData.is_service == 1"> <div v-if="merData.is_service == 1">
<span class="basic-label">技术服务费：</span> <span class="basic-label">技术服务费：</span>
<span class="font_red">{{ merData.service_cost }}元</span> <span class="font_red">{{ serviceNumber}}元</span>
<div class="margin_count" @mouseenter="getCode('service')"> <div class="margin_count" @mouseenter="getCode('service')">
<el-button type="text" size="small" class="mr10 pay_btn">去支付技术服务费</el-button> <el-button type="text" size="small" class="mr10 pay_btn">去支付技术服务费</el-button>
<!--支付二维码--> <!--支付二维码-->
@ -95,7 +95,7 @@
<div> <div>
<!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> --> <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
<!-- <div class="pay_type">请使用微信扫码支付</div> --> <!-- <div class="pay_type">请使用微信扫码支付</div> -->
<div class="pay_price">￥{{ merData.service_cost }}元</div> <div class="pay_price">￥{{ serviceNumber }}元</div>
<div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div> <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
<div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div> <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
<div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div> <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
@ -107,7 +107,7 @@
<!--商品上架费--> <!--商品上架费-->
<div v-if="merData.is_goods == 1"> <div v-if="merData.is_goods == 1">
<span class="basic-label">上架费：</span> <span class="basic-label">上架费：</span>
<span class="font_red">{{ merData.goods_cost }}元</span> <span class="font_red">{{ goodsNumber }}元</span>
<div class="margin_count" @mouseenter="getCode('goods')"> <div class="margin_count" @mouseenter="getCode('goods')">
<el-button type="text" size="small" class="mr10 pay_btn">去支付上架费</el-button> <el-button type="text" size="small" class="mr10 pay_btn">去支付上架费</el-button>
<div class="erweima"> <div class="erweima">
@ -115,7 +115,7 @@
<div> <div>
<!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> --> <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
<!-- <div class="pay_type">请使用微信扫码支付</div> --> <!-- <div class="pay_type">请使用微信扫码支付</div> -->
<div class="pay_price">￥{{ merData.goods_cost }}元</div> <div class="pay_price">￥{{ goodsNumber }}元</div>
<div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div> <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
<div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div> <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
<div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div> <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
@ -127,7 +127,7 @@
<!--已支付--> <!--已支付-->
<div v-if="merData.is_margin == 10 " class="margin_main"> <div v-if="merData.is_margin == 10 " class="margin_main">
<span class="basic-label">店铺保证金：</span> <span class="basic-label">店铺保证金：</span>
<span class="margin_price">{{ merData.margin }}元</span> <span class="margin_price">{{ marginNumber }}元</span>
<div class="margin_count"> <div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span> <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
<!--保证金弹窗--> <!--保证金弹窗-->
@ -135,7 +135,7 @@
<div> <div>
<img src="@/assets/images/margin03.png"> <img src="@/assets/images/margin03.png">
<div class="alic"> <div class="alic">
<span class="text_g">剩余保证金￥{{ merData.margin }}元</span> <span class="text_g">剩余保证金￥{{ marginNumber }}元</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button> <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
</div> </div>
</div> </div>
@ -163,7 +163,7 @@
<!-- 技术服务费 --> <!-- 技术服务费 -->
<div v-if="merData.is_service == 10 " class="margin_main"> <div v-if="merData.is_service == 10 " class="margin_main">
<span class="basic-label">技术服务费：</span> <span class="basic-label">技术服务费：</span>
<span class="margin_price">{{ merData.service_cost }}元</span> <span class="margin_price">{{ serviceNumber }}元</span>
<div class="margin_count"> <div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span> <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
<!--保证金弹窗--> <!--保证金弹窗-->
@ -171,7 +171,7 @@
<div> <div>
<img src="@/assets/images/margin03.png"> <img src="@/assets/images/margin03.png">
<div class="alic"> <div class="alic">
<span class="text_g">剩余技术服务费￥{{ merData.service_cost }}元</span> <span class="text_g">剩余技术服务费￥{{ serviceNumber }}元</span>
</div> </div>
</div> </div>
</div> </div>
@ -198,7 +198,7 @@
<!-- 上架费 --> <!-- 上架费 -->
<div v-if="merData.is_goods == 10 " class="margin_main"> <div v-if="merData.is_goods == 10 " class="margin_main">
<span class="basic-label">上架费：</span> <span class="basic-label">上架费：</span>
<span class="margin_price">{{ merData.goods_cost }}元</span> <span class="margin_price">{{ goodsNumber }}元</span>
<div class="margin_count"> <div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span> <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
<!--保证金弹窗--> <!--保证金弹窗-->
@ -206,7 +206,7 @@
<div> <div>
<img src="@/assets/images/margin03.png"> <img src="@/assets/images/margin03.png">
<div class="alic"> <div class="alic">
<span class="text_g">剩余上架费￥{{ merData.goods_cost }}元</span> <span class="text_g">剩余上架费￥{{ goodsNumber }}元</span>
</div> </div>
</div> </div>
</div> </div>
@ -587,6 +587,11 @@
<span>{{scope.row.type == 10?'保证金':scope.row.type == 30?'上架费':'技术服务费'}}</span> <span>{{scope.row.type == 10?'保证金':scope.row.type == 30?'上架费':'技术服务费'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="缴费状态" min-width="80">
<template scope="scope">
<span>{{ statusMode[scope.row.status] }}</span>
</template>
</el-table-column>
<el-table-column label="备注" min-width="100" prop="mark" /> <el-table-column label="备注" min-width="100" prop="mark" />
<el-table-column label="拒绝原因" min-width="100" prop="refuse" /> <el-table-column label="拒绝原因" min-width="100" prop="refuse" />
<el-table-column prop="create_time" label="缴费时间" min-width="120" /> <el-table-column prop="create_time" label="缴费时间" min-width="120" />
@ -703,6 +708,13 @@ export default {
serviceQrEndTime: '', serviceQrEndTime: '',
goodsQrEndTime: '', goodsQrEndTime: '',
supplyPay: false, supplyPay: false,
statusMode:{
'0':'待审核',
'1':'审核通过',
'-1':'失败',
'-2':'审核拒绝',
'20':'已退款'
},
goPay: false, goPay: false,
tableFrom: { tableFrom: {
page: 1, page: 1,