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-29 09:15:50 +08:00
parent 7b67c6ce0a
commit 61b0c2a8d9
5 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/filters/commFilter.js
View File

@ -96,13 +96,14 @@ export function cancelOrderStatusFilter(status) {
export function orderPayType(type) {
const typeMap = {
'0': '余额支付',
'0': '消费券支付',
'1': '微信支付',
'2': '小程序',
'3': '微信支付',
'4': '支付宝',
'5': '支付宝扫码',
'6': '微信扫码'
'6': '微信扫码',
'7': '铸源星支付',
}
return typeMap[type]
}

5
src/views/order/index.vue
View File

@ -79,9 +79,10 @@
class="selWidth"
@change="getList(1),getCardList()"
>
<el-option label="余额" value="0" />
<el-option label="消费券" value="0" />
<el-option label="微信" value="1" />
<el-option label="支付宝" value="2" />
<el-option label="铸源星" value="7" />
</el-select>
</el-form-item>
<el-form-item label="关键字：" prop="keywords">
@ -192,7 +193,7 @@
<p v-if="scope.row.finalOrder">尾款：{{ scope.row.finalOrder.pay_price }}</p>
</template>
</el-table-column>
<el-table-column label="支付类型" min-width="80">
<el-table-column label="支付方式" min-width="80">
<template slot-scope="scope">
<span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
<span v-else>--</span>

20
src/views/order/orderRefund/index.vue
View File

@ -105,6 +105,20 @@
@keyup.enter.native="getList(1)"
/>
</el-form-item>
<el-form-item label="支付方式：" prop="pay_type">
<el-select
v-model="tableFrom.pay_type"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-option label="消费券" value="0" />
<el-option label="微信" value="1" />
<el-option label="支付宝" value="2" />
<el-option label="铸源星" value="7" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
@ -162,6 +176,12 @@
<el-table-column prop="order.order_sn" label="订单号" min-width="100" />
<el-table-column prop="user.nickname" label="用户信息" min-width="100" />
<el-table-column prop="refund_price" label="退款金额" min-width="80" />
<el-table-column label="支付方式" min-width="80">
<template slot-scope="scope">
<span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="nickname" label="商品信息" min-width="260">
<template slot-scope="scope">
<div

5
src/views/product/addProduct/index.vue
View File

@ -2489,7 +2489,7 @@ export default {
ot_price: null,
proportion:0.6,
stock: null,
growth:0,
// growth:0,
bar_code: '',
weight: null,
volume: null,
@ -2655,7 +2655,8 @@ export default {
if(i=='price'){
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
val.cost = (e * val.proportion).toFixed(2)
val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
// val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
val.growth = parseInt(val.price*val.proportion)
}
if(i=='bar_code'){
val.bar_code = val.bar_code.replace(/[\W]/g,'')

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

@ -55,7 +55,7 @@
<div>
<!--未支付-->
<div v-if="merData.is_margin == 1" class="margin_main">
<span class="basic-label">店铺保证金：</span>
<span class="basic-label">应缴店铺保证金：</span>
<span class="font_red">{{ marginNumber }}元</span>
<div class="margin_count" @mouseenter="getCode('all')">
<!--支付二维码-->
@ -84,7 +84,7 @@
</div>
<!--技术服务费-->
<div v-if="merData.is_service == 1" class="margin_main">
<span class="basic-label">技术服务费：</span>
<span class="basic-label">应缴技术服务费：</span>
<span class="font_red">{{ serviceNumber}}元</span>
<div class="margin_count" @mouseenter="getCode('service')">
<!--支付二维码-->
@ -104,7 +104,7 @@
</div>
<!--商品上架费-->
<div v-if="merData.is_goods == 1" class="margin_main">
<span class="basic-label">上架费：</span>
<span class="basic-label">应缴上架费：</span>
<span class="font_red">{{ goodsNumber }}元</span>
<div class="margin_count" @mouseenter="getCode('goods')">
<div class="erweima">
@ -123,7 +123,7 @@
</div>
<!--已支付-->
<div v-if="merData.is_margin == 10 " class="margin_main">
<span class="basic-label">店铺保证金：</span>
<span class="basic-label">应缴店铺保证金：</span>
<span class="margin_price">{{ marginNumber }}元</span>
<div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords('mer_margin')">查看转账记录</span>
@ -132,7 +132,7 @@
</div>
<!-- 技术服务费 -->
<div v-if="merData.is_service == 10 " class="margin_main">
<span class="basic-label">技术服务费：</span>
<span class="basic-label">应缴技术服务费：</span>
<span class="margin_price">{{ serviceNumber }}元</span>
<div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords('mer_service')">查看转账记录</span>
@ -141,7 +141,7 @@
</div>
<!-- 上架费 -->
<div v-if="merData.is_goods == 10 " class="margin_main">
<span class="basic-label">上架费：</span>
<span class="basic-label">应缴上架费：</span>
<span class="margin_price">{{ goodsNumber }}元</span>
<div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords('mer_goods')">查看转账记录</span>