faiz
/
settledIn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

折扣,定制产品

This commit is contained in:
faiz 2024-08-26 10:28:19 +08:00
parent 04e8256a9d
commit 4042b16a75
11 changed files with 178 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -7,7 +7,7 @@ VUE_APP_BASE_API = 'http://test.tropjoin.com'
# VUE_APP_BASE_API = 'https://api.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com'
# socket 连接地址 # socket 连接地址
VUE_APP_WS_URL = 'ws://http://test.tropjoin.com' VUE_APP_WS_URL = 'wss://test.tropjoin.com'
# VUE_APP_WS_URL = 'ws://https://api.tropjoin.com' # VUE_APP_WS_URL = 'ws://https://api.tropjoin.com'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

7
src/views/accounts/statement/merchantBill.vue
View File

@ -58,7 +58,7 @@
/> />
<el-table-column <el-table-column
prop="order_amount" prop="order_amount"
label="贷款金额" label="货款金额"
min-width="150" min-width="150"
/> />
@ -77,6 +77,11 @@
label="可提现金额" label="可提现金额"
min-width="150" min-width="150"
/> />
<el-table-column
prop="invoice_amount"
label="开票金额"
min-width="150"
/>
<el-table-column label="操作" min-width="100" fixed="right"> <el-table-column label="操作" min-width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="{path: roterPre + '/accounts/billDetails/' + scope.row.mer_id}"> <router-link :to="{path: roterPre + '/accounts/billDetails/' + scope.row.mer_id}">

4
src/views/daily-statistics/components/DayData.vue
View File

@ -199,7 +199,7 @@ export default {
legend: { legend: {
data: [ data: [
"实付订单金额(含运费/元)", "实付订单金额(含运费/元)",
"抵扣券使用数量", "折扣使用数量",
"退订单退款金额(元)", "退订单退款金额(元)",
], ],
orient: "vertical", orient: "vertical",
@ -256,7 +256,7 @@ export default {
data: order_amount, data: order_amount,
}, },
{ {
name: "抵扣券使用数量", name: "折扣使用数量",
type: "line", type: "line",
stack: "Total", stack: "Total",
areaStyle: {}, areaStyle: {},

2
src/views/daily-statistics/index.vue
View File

@ -37,7 +37,7 @@
<el-table-column label="支付人数(人)" min-width="130" prop="pay_count"></el-table-column> <el-table-column label="支付人数(人)" min-width="130" prop="pay_count"></el-table-column>
<el-table-column label="支付订单数(单)" min-width="130" prop="order_count"></el-table-column> <el-table-column label="支付订单数(单)" min-width="130" prop="order_count"></el-table-column>
<el-table-column label="实付订单金额(含运费/元)" min-width="130" prop="order_amount"></el-table-column> <el-table-column label="实付订单金额(含运费/元)" min-width="130" prop="order_amount"></el-table-column>
<el-table-column label="抵扣券使用数量" min-width="130" prop="order_coupon"></el-table-column> <el-table-column label="折扣使用数量" min-width="130" prop="order_coupon"></el-table-column>
<el-table-column label="退订单退款金额(元)" min-width="130" prop="refund_amount"></el-table-column> <el-table-column label="退订单退款金额(元)" min-width="130" prop="refund_amount"></el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">

9
src/views/order/list/orderDetails.vue
View File

@ -111,8 +111,9 @@
<div class="value">使用了{{ orderDetailList.integral }}个铸源星，抵扣了{{ orderDetailList.integral_price }}元</div> <div class="value">使用了{{ orderDetailList.integral }}个铸源星，抵扣了{{ orderDetailList.integral_price }}元</div>
</li> </li>
<li v-if="orderDetailList.amount_price>0" class="item"> <li v-if="orderDetailList.amount_price>0" class="item">
<div>抵扣券抵扣：</div> <div>折扣：</div>
<div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个抵扣券，抵扣了{{ orderDetailList.amount_price }}元</div> <!-- <div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">使用了{{ orderDetailList.amount_price }}个折扣，抵扣了{{ orderDetailList.amount_price }}元</div> -->
<div v-if="orderDetailList.amount_price && orderDetailList.amount_price != 0" class="value">-{{ orderDetailList.amount_price }}元</div>
</li> </li>
<li class="item"> <li class="item">
<div>订单总价：</div> <div>订单总价：</div>
@ -128,8 +129,8 @@
<div v-else class="value">{{ orderDetailList.delivery_type | sendWay }}</div> <div v-else class="value">{{ orderDetailList.delivery_type | sendWay }}</div>
</li> </li>
<li v-if="orderDetailList.platform_coupon_price>0" class="item"> <li v-if="orderDetailList.platform_coupon_price>0" class="item">
<div>活动抵扣券: </div> <div>活动折扣: </div>
<div v-if="orderDetailList.platform_coupon_price && orderDetailList.platform_coupon_price != 0" class="value">使用了{{ orderDetailList.platform_coupon_price }}个抵扣券，抵扣了{{ orderDetailList.platform_coupon_price }}元</div> <div v-if="orderDetailList.platform_coupon_price && orderDetailList.platform_coupon_price != 0" class="value">使用了{{ orderDetailList.platform_coupon_price }}个折扣，抵扣了{{ orderDetailList.platform_coupon_price }}元</div>
</li> </li>
<li class="item"> <li class="item">
<div>支付运费：</div> <div>支付运费：</div>

2
src/views/order/refund/refundDetail.vue
View File

@ -34,7 +34,7 @@
<div v-if="orderDatalist.delivery_id" class="description-term">退货快递单号：{{ orderDatalist.delivery_id }}</div> <div v-if="orderDatalist.delivery_id" class="description-term">退货快递单号：{{ orderDatalist.delivery_id }}</div>
<div class="description-term">创建时间：{{ orderDatalist.create_time }}</div> <div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
<div class="description-term">退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}</div> <div class="description-term">退货金额：{{ orderDatalist.refund_price-orderDatalist.refund_postage }}</div>
<div class="description-term">退抵扣券：{{ orderDatalist.amount }}</div> <div class="description-term">退折扣：{{ orderDatalist.amount }}</div>
<div class="description-term">退运费金额：{{ orderDatalist.refund_postage }}</div> <div class="description-term">退运费金额：{{ orderDatalist.refund_postage }}</div>
<div class="description-term">商家备注：{{ orderDatalist.mer_mark }}</div> <div class="description-term">商家备注：{{ orderDatalist.mer_mark }}</div>
<div class="description-term100">退款凭证： <div class="description-term100">退款凭证：

4
src/views/product/productExamine/editAttr.vue
View File

@ -71,7 +71,7 @@
<el-input @input="handleOnform('proportion')" v-model="oneFormBatch[0].proportion" :min="0" class="priceBox" controls-position="right"/> <el-input @input="handleOnform('proportion')" v-model="oneFormBatch[0].proportion" :min="0" class="priceBox" controls-position="right"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="抵扣券" min-width="100" align="center"> <el-table-column label="折扣" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input @input="batchInput" v-model="oneFormBatch[0].coupon" class="priceBox" controls-position="right"/> <el-input @input="batchInput" v-model="oneFormBatch[0].coupon" class="priceBox" controls-position="right"/>
</template> </template>
@ -288,7 +288,7 @@ const objTitle = {
title: '占比' title: '占比'
}, },
coupon:{ coupon:{
title:'抵扣券' title:'折扣'
}, },
stock: { stock: {
title: '库存' title: '库存'

125
src/views/product/productExamine/index.vue
View File

@ -212,7 +212,11 @@
<el-option label="已上架修改" value="3" /> <el-option label="已上架修改" value="3" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="待审核状态：" prop="status" v-if="Number(tableFrom.type) == 12"> <el-form-item
label="待审核状态："
prop="status"
v-if="Number(tableFrom.type) == 12"
>
<el-select <el-select
v-model="tableFrom.status" v-model="tableFrom.status"
placeholder="请选择" placeholder="请选择"
@ -247,7 +251,7 @@
<el-card class="mt14"> <el-card class="mt14">
<el-tabs <el-tabs
v-model="tableFrom.type" v-model="tableFrom.type"
@tab-click="getList(1), getLstFilterApi(),setSort()" @tab-click="getList(1), getLstFilterApi(), setSort()"
> >
<el-tab-pane <el-tab-pane
v-for="(item, index) in headeNum" v-for="(item, index) in headeNum"
@ -257,7 +261,13 @@
/> />
</el-tabs> </el-tabs>
<div class="mt5 mb20"> <div class="mt5 mb20">
<el-button v-show="tableFrom.type === '11'" size="small" :disabled="multipleSelection.length==0" @click="batch">批量审核</el-button> <el-button
v-show="tableFrom.type === '11'"
size="small"
:disabled="multipleSelection.length == 0"
@click="batch"
>批量审核</el-button
>
<el-button <el-button
size="small" size="small"
:disabled="multipleSelection.length == 0" :disabled="multipleSelection.length == 0"
@ -376,6 +386,13 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="is_customize" label="定制产品" min-width="180">
<template slot-scope="scope">
<div>
{{ scope.row.is_customize ? "是" : "否" }}
</div>
</template>
</el-table-column>
<el-table-column label="店铺名称" min-width="100"> <el-table-column label="店铺名称" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
@ -391,8 +408,18 @@
<el-table-column prop="price" label="商品售价" min-width="80" /> <el-table-column prop="price" label="商品售价" min-width="80" />
<el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" /> <el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" />
<el-table-column prop="operator" label="操作人" min-width="110" /> <el-table-column prop="operator" label="操作人" min-width="110" />
<el-table-column prop="create_time" sortable='custom' label="创建时间" min-width="120" /> <el-table-column
<el-table-column prop="update_time" sortable='custom' label="更新时间" min-width="120" /> prop="create_time"
sortable="custom"
label="创建时间"
min-width="120"
/>
<el-table-column
prop="update_time"
sortable="custom"
label="更新时间"
min-width="120"
/>
<!-- <el-table-column label="是否惠美乡村店铺" min-width="80"> <!-- <el-table-column label="是否惠美乡村店铺" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span> <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
@ -469,8 +496,8 @@
type="text" type="text"
size="small" size="small"
@click="getBack(scope.row.product_id)" @click="getBack(scope.row.product_id)"
v-if="[7 ,9, 10, 11].includes(Number(tableFrom.type))" v-if="[7, 9, 10, 11].includes(Number(tableFrom.type))"
>{{tableFrom.type==7?'撤回':'返回'}}</el-button >{{ tableFrom.type == 7 ? "撤回" : "返回" }}</el-button
> >
<el-button <el-button
type="text" type="text"
@ -513,7 +540,11 @@
>编辑标记</el-dropdown-item >编辑标记</el-dropdown-item
> >
<el-dropdown-item <el-dropdown-item
v-if="tableFrom.type === '6' || tableFrom.type === '1' || tableFrom.type === '9'" v-if="
tableFrom.type === '6' ||
tableFrom.type === '1' ||
tableFrom.type === '9'
"
@click.native="toVirtualSales(scope.row.product_id)" @click.native="toVirtualSales(scope.row.product_id)"
>已售数量</el-dropdown-item >已售数量</el-dropdown-item
> >
@ -594,15 +625,29 @@
size="small" size="small"
/> />
</el-form-item> </el-form-item>
<el-form-item label="商品封面图：" prop="image"> <div style="display: flex">
<div class="demo-image__preview"> <el-form-item label="商品封面图：" prop="image">
<el-image <div class="demo-image__preview">
style="width: 60px; height: 60px" <el-image
:src="formValidate.image" style="width: 60px; height: 60px"
:preview-src-list="[formValidate.image]" :src="formValidate.image"
/> :preview-src-list="[formValidate.image]"
</div> />
</el-form-item> </div>
</el-form-item>
<el-form-item
style="margin-left: 100px"
label="定制产品："
prop="audit_type"
>
<el-radio-group v-model="formValidate.is_customize">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item>
</div>
<el-form-item label="星级推荐："> <el-form-item label="星级推荐：">
<el-rate <el-rate
class="rate_star" class="rate_star"
@ -873,7 +918,7 @@ export default {
{ label: "产品部审核", value: 0 }, { label: "产品部审核", value: 0 },
{ label: "产品部复审", value: 9 }, { label: "产品部复审", value: 9 },
{ label: "运维专员审核", value: 10 }, { label: "运维专员审核", value: 10 },
{ label: "最终审核", value: 11 } { label: "最终审核", value: 11 },
], ],
auditedList: ["首次提报", "已上架提报", "首次修改", "已上架修改"], auditedList: ["首次提报", "已上架提报", "首次修改", "已上架修改"],
recommend: proOptions, recommend: proOptions,
@ -897,6 +942,7 @@ export default {
], ],
formValidate: { formValidate: {
is_hot: 0, is_hot: 0,
is_customize: 0,
is_best: 0, is_best: 0,
is_new: 0, is_new: 0,
is_benefit: 0, is_benefit: 0,
@ -912,7 +958,7 @@ export default {
slider_image: [], slider_image: [],
qualification: {}, qualification: {},
image: "", image: "",
audit_type:0 audit_type: 0,
}, },
productStatusList: [ productStatusList: [
{ label: "上架显示", value: 1 }, { label: "上架显示", value: 1 },
@ -939,7 +985,7 @@ export default {
cate_id: "", cate_id: "",
sys_labels: "", sys_labels: "",
pid: "", pid: "",
operator:'', operator: "",
tag_name: "", tag_name: "",
store_name: "", store_name: "",
audit_type: "", audit_type: "",
@ -952,7 +998,7 @@ export default {
svip_price_type: "", svip_price_type: "",
is_audited: "", is_audited: "",
is_huimei: "", is_huimei: "",
order:'', order: "",
product_id: this.$route.query.id ? this.$route.query.id : "", product_id: this.$route.query.id ? this.$route.query.id : "",
}, },
categoryList: [], categoryList: [],
@ -971,13 +1017,11 @@ export default {
dialogLabel: false, dialogLabel: false,
isBatch: false, isBatch: false,
labelForm: { labelForm: {
ids:[], ids: [],
tag_name:'' tag_name: "",
}, },
rules: { rules: {
tag_name: [ tag_name: [{ required: true, message: "请输入标记", trigger: "blur" }],
{ required: true, message: "请输入标记", trigger: "blur" },
]
}, },
recommendForm: {}, recommendForm: {},
drawer: false, drawer: false,
@ -1001,23 +1045,25 @@ export default {
}, },
}, },
methods: { methods: {
handleSortChange(row){ handleSortChange(row) {
switch (row.prop) { switch (row.prop) {
case 'create_time': case "create_time":
this.tableFrom.order = row.order == 'ascending' ? 'create_asc' : 'create_desc'; this.tableFrom.order =
row.order == "ascending" ? "create_asc" : "create_desc";
break; break;
case 'update_time': case "update_time":
this.tableFrom.order = row.order == 'ascending' ? 'update_asc' : 'update_desc'; this.tableFrom.order =
row.order == "ascending" ? "update_asc" : "update_desc";
break; break;
default: default:
break; break;
} }
this.getList('') this.getList("");
}, },
setSort(){ setSort() {
this.$refs.table.clearSort() this.$refs.table.clearSort();
this.tableFrom.order = '' this.tableFrom.order = "";
this.tableFrom.status = '' this.tableFrom.status = "";
}, },
getBack(id) { getBack(id) {
this.$modalForm(productBackApi(id)).then(() => this.getList("")); this.$modalForm(productBackApi(id)).then(() => this.getList(""));
@ -1087,7 +1133,7 @@ export default {
this.updateTimeVal = []; this.updateTimeVal = [];
this.tableFrom.date = ""; this.tableFrom.date = "";
this.tableFrom.update_date = ""; this.tableFrom.update_date = "";
this.setSort() this.setSort();
this.$refs.searchForm.resetFields(); this.$refs.searchForm.resetFields();
this.getList(1); this.getList(1);
}, },
@ -1260,7 +1306,8 @@ export default {
slider_image: info.slider_image, slider_image: info.slider_image,
qualification: info.qualification, qualification: info.qualification,
image: info.image, image: info.image,
audit_type:info.audit_type audit_type: info.audit_type,
is_customize: info.is_customize || 0,
}; };
if (info.is_benefit === 1) this.checkboxGroup.push("is_benefit"); if (info.is_benefit === 1) this.checkboxGroup.push("is_benefit");
if (info.is_hot === 1) this.checkboxGroup.push("is_hot"); if (info.is_hot === 1) this.checkboxGroup.push("is_hot");
@ -1351,7 +1398,7 @@ export default {
// 批量设置标签 // 批量设置标签
batchLabel() { batchLabel() {
this.labelForm = { this.labelForm = {
tag_name: '', tag_name: "",
ids: this.OffId, ids: this.OffId,
}; };
console.log(this.labelForm); console.log(this.labelForm);

55
src/views/product/productExamine/info.vue
View File

@ -85,6 +85,9 @@
/> />
</div> </div>
</span> </span>
<span class="sp"
>定制产品：{{ projectData.is_customize ? "是" : "否" }}</span
>
</div> </div>
<el-tabs <el-tabs
v-if="projectData && isShow" v-if="projectData && isShow"
@ -604,6 +607,12 @@
label-width="80px" label-width="80px"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="定制产品" prop="is_customize">
<el-radio-group v-model="ruleForm.is_customize">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item <el-form-item
:label="projectData.status == 15 ? '解锁状态' : '审核状态'" :label="projectData.status == 15 ? '解锁状态' : '审核状态'"
prop="status" prop="status"
@ -671,7 +680,10 @@
</el-form> </el-form>
<div class="edit_mark"> <div class="edit_mark">
<div>信息变更：</div> <div>信息变更：</div>
<div style="color: red;margin-left: 70px;" v-html="projectData.edit_mark"></div> <div
style="color: red; margin-left: 70px"
v-html="projectData.edit_mark"
></div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible = false">取 消</el-button> <el-button size="small" @click="dialogVisible = false">取 消</el-button>
@ -717,7 +729,7 @@ const defaultObj = {
cost: null, cost: null,
ot_price: null, ot_price: null,
proportion: 0.6, proportion: 0.6,
coupon:'', coupon: "",
stock: 0, stock: 0,
// growth: 0, // growth: 0,
bar_code: "", bar_code: "",
@ -748,8 +760,8 @@ const objTitle = {
proportion: { proportion: {
title: "占比", title: "占比",
}, },
coupon:{ coupon: {
title:'抵扣券' title: "折扣",
}, },
stock: { stock: {
title: "库存", title: "库存",
@ -831,6 +843,7 @@ export default {
refusal: "", refusal: "",
status: 1, status: 1,
id: "", id: "",
is_customize: 0,
status_img: [], status_img: [],
}, },
formThead: Object.assign({}, objTitle), formThead: Object.assign({}, objTitle),
@ -971,20 +984,23 @@ export default {
this.$refs.ruleForm.validate((valid) => { this.$refs.ruleForm.validate((valid) => {
if (valid) { if (valid) {
let params = {}; let params = {};
if(this.isShow){ if (this.isShow) {
params = { params = {
...this.ruleForm, ...this.ruleForm,
id:this.proId, id: this.proId,
status:this.ruleForm.status == -1? -1: mode[this.projectData.status].status, status:
}; this.ruleForm.status == -1
}else{ ? -1
params = { : mode[this.projectData.status].status,
...this.ruleForm, };
id:this.ids, } else {
status:this.ruleForm.status == -1? -1:1 params = {
}; ...this.ruleForm,
} id: this.ids,
mode[this.isShow?this.projectData.status:11] status: this.ruleForm.status == -1 ? -1 : 1,
};
}
mode[this.isShow ? this.projectData.status : 11]
.api(params) .api(params)
.then((res) => { .then((res) => {
this.$message.success(res.message); this.$message.success(res.message);
@ -1031,7 +1047,8 @@ export default {
import_name: "", import_name: "",
}; };
this.qualification = res.data.qualification || qualification; this.qualification = res.data.qualification || qualification;
this.qualification.commodityList = this.qualification.commodityList.slice(0,20) this.qualification.commodityList =
this.qualification.commodityList.slice(0, 20);
this.svip_type = res.data.svip_price_type; this.svip_type = res.data.svip_price_type;
if (this.projectData.spec_type === 0) { if (this.projectData.spec_type === 0) {

56
src/views/product/productExamine/proDetails.vue
View File

@ -203,6 +203,12 @@
</div> </div>
</template> </template>
</li> </li>
<li class="item">
<div class="item-title">定制产品：</div>
<div class="value">
{{ productData.is_customize ? "是" : "否" }}
</div>
</li>
</ul> </ul>
<ul v-if="productData.video_link" class="list"> <ul v-if="productData.video_link" class="list">
<li class="item item100"> <li class="item item100">
@ -380,7 +386,9 @@
target="_blank" target="_blank"
>{{ scope.row[iii] }}</a >{{ scope.row[iii] }}</a
> >
<span v-else class="priceBox">{{ scope.row[iii] }}</span> <span v-else class="priceBox">{{
scope.row[iii]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="productData.extension_type === 1"> <template v-if="productData.extension_type === 1">
@ -524,9 +532,7 @@
<div class="item-title">实际销量 ：</div> <div class="item-title">实际销量 ：</div>
<div class="value"> <div class="value">
<span> <span>
{{ {{ productData.sales - productData.ficti }}
productData.sales - productData.ficti
}}
(指实际售出数量)</span (指实际售出数量)</span
> >
</div> </div>
@ -730,15 +736,21 @@
</li> </li>
<li class="item"> <li class="item">
<div class="item-title">企业名称：</div> <div class="item-title">企业名称：</div>
<div class="value">{{productData.merchant && productData.merchant.ext.com &&productData.merchant.ext.com.name}}</div> <div class="value">
{{
productData.merchant &&
productData.merchant.ext.com &&
productData.merchant.ext.com.name
}}
</div>
</li> </li>
<li class="item"> <li class="item">
<div class="item-title">店铺联系人：</div> <div class="item-title">店铺联系人：</div>
<div class="value">{{productData.merchant.real_name}}</div> <div class="value">{{ productData.merchant.real_name }}</div>
</li> </li>
<li class="item"> <li class="item">
<div class="item-title">联系人电话：</div> <div class="item-title">联系人电话：</div>
<div class="value">{{productData.merchant.mer_phone}}</div> <div class="value">{{ productData.merchant.mer_phone }}</div>
</li> </li>
</ul> </ul>
</div> </div>
@ -839,12 +851,16 @@
<div class="section"> <div class="section">
<ul class="list"> <ul class="list">
<li class="audit" v-if="productData.refusal"> <li class="audit" v-if="productData.refusal">
<div class="item-title">{{productData.status==0?'锁定原因':'审核拒绝原因'}}：</div> <div class="item-title">
{{
productData.status == 0 ? "锁定原因" : "审核拒绝原因"
}}：
</div>
<div style="margin-left: 100px" class="value"> <div style="margin-left: 100px" class="value">
<pre>{{ productData.refusal || "" }}</pre> <pre>{{ productData.refusal || "" }}</pre>
</div> </div>
</li> </li>
<li class="item item100" v-if="productData.status!=0"> <li class="item item100" v-if="productData.status != 0">
<div class="item-title">佐证图片：</div> <div class="item-title">佐证图片：</div>
<el-image <el-image
v-for="(item, index) in productData.status_img" v-for="(item, index) in productData.status_img"
@ -1199,11 +1215,11 @@ const defaultObj = {
cost: null, cost: null,
ot_price: null, ot_price: null,
proportion: 0.6, proportion: 0.6,
coupon:'', coupon: "",
stock: 0, stock: 0,
// growth: 0, // growth: 0,
bar_code: "", bar_code: "",
gist_url:null, gist_url: null,
weight: null, weight: null,
volume: null, volume: null,
}, },
@ -1230,8 +1246,8 @@ const objTitle = {
proportion: { proportion: {
title: "占比", title: "占比",
}, },
coupon:{ coupon: {
title:'抵扣券' title: "折扣",
}, },
stock: { stock: {
title: "库存", title: "库存",
@ -1245,7 +1261,7 @@ const objTitle = {
weight: { weight: {
title: "重量（KG）", title: "重量（KG）",
}, },
gist_url:{ gist_url: {
title: "依据链接", title: "依据链接",
}, },
volume: { volume: {
@ -1331,11 +1347,12 @@ export default {
}, },
isValidURL(url) { isValidURL(url) {
// (http|https):\/\/([\w.]+\/?)\S* // (http|https):\/\/([\w.]+\/?)\S*
var pattern = /^(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/; var pattern =
if(!pattern.test(url)){ /^(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
return `https://${url}` if (!pattern.test(url)) {
return `https://${url}`;
} }
return url return url;
// return pattern.test(url); // return pattern.test(url);
}, },
handleClose() { handleClose() {
@ -1367,7 +1384,8 @@ export default {
import_name: "", import_name: "",
}; };
this.qualification = res.data.qualification || qualification; this.qualification = res.data.qualification || qualification;
this.qualification.commodityList = this.qualification.commodityList.slice(0,20) this.qualification.commodityList =
this.qualification.commodityList.slice(0, 20);
this.mer_svip_status = res.data.mer_svip_status; this.mer_svip_status = res.data.mer_svip_status;
this.svip_type = res.data.svip_price_type; this.svip_type = res.data.svip_price_type;
if (this.productData.spec_type === 0) { if (this.productData.spec_type === 0) {

2
src/views/user/list/userDetails.vue
View File

@ -547,7 +547,7 @@
</div> </div>
</template> </template>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="抵扣券变更" name="balance" size="small"> <el-tab-pane label="折扣变更" name="balance" size="small">
<template v-if="activeName == 'balance'"> <template v-if="activeName == 'balance'">
<el-table :data="tableData.data" size="small"> <el-table :data="tableData.data" size="small">
<el-table-column <el-table-column