From 5e57aaab530de50ed7b4bac5ad36ef589e30b039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Mon, 18 Nov 2024 15:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=83=A0=E4=B8=93=E5=8C=BA,=E6=88=90?=
=?UTF-8?q?=E9=95=BF=E5=80=BC=E7=89=B9=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/views/product/addProduct/index.vue | 73 ++++++++++++++++----
src/views/product/productList/index.vue | 9 ++-
src/views/product/productList/proDetails.vue | 6 ++
4 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/.env.development b/.env.development
index 6caf031..e9ab625 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://test.tropjoin.com'
+VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
# VUE_APP_BASE_API = 'https://api.tropjoin.com'
# socket 连接地址
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index d0155b3..a38b690 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -55,6 +55,29 @@
</div>
</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="特惠专区产品:">
+ <el-radio-group
+ v-model="formValidate.is_benefit"
+ :disabled="virStatus"
+ @change="onChangeBenefit(formValidate.is_benefit)"
+ >
+ <el-radio :label="1" class="radio">是</el-radio>
+ <el-radio :label="0">否</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="惠美乡村产品:">
+ <el-radio-group
+ v-model="formValidate.is_huimei"
+ :disabled="virStatus"
+ >
+ <el-radio :label="1" class="radio">是</el-radio>
+ <el-radio :label="0">否</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
<el-col :span="24">
<el-form-item label="商品名称：" prop="store_name">
<el-input
@@ -110,17 +133,6 @@
</div> -->
</el-form-item>
</el-col>
- <el-col :span="19">
- <el-form-item label="惠美乡村产品:">
- <el-radio-group
- v-model="formValidate.is_huimei"
- :disabled="virStatus"
- >
- <el-radio :label="1" class="radio">是</el-radio>
- <el-radio :label="0">否</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
<!-- <el-col :span="24">
<el-form-item label="商户商品分类：">
<el-cascader
@@ -2539,6 +2551,7 @@ const defaultObj = {
qualification_type: 0,
remark: "",
is_huimei: 0,
+ is_benefit: 0,
audit_type: 0,
qualification: {
production_name: "",
@@ -3195,7 +3208,13 @@ export default {
item => item.value == val.proportion
);
val.coupon = Math.floor(val.price * obj.coupon);
- val.growth = Math.floor(val.price * obj.growth);
+ // val.growth = Math.floor(val.price * obj.growth);
+ val.growth = this.formValidate.is_benefit
+ ? Math.floor(val.price * 0.2)
+ : Math.floor(val.price * obj.growth);
+ console.log(val.growth);
+
+ console.log(this.formValidate.is_benefit);
}
if (i == "bar_code") {
val.bar_code = val.bar_code.replace(/[\W]/g, "");
@@ -4021,6 +4040,31 @@ export default {
});
}
},
+ // 特惠专区
+ onChangeBenefit(val) {
+ this.OneattrValue.map(item => {
+ let obj = this.proportionList.find(
+ items => items.value == item.proportion
+ );
+ let growth = val
+ ? Math.floor(item.price * 0.2)
+ : Math.floor(item.price * obj.growth);
+
+ this.$set(item, "growth", growth);
+ });
+ this.ManyAttrValue.map(item => {
+ let obj = this.proportionList.find(
+ items => items.value == item.proportion
+ );
+ let growth = val
+ ? Math.floor(item.price * 0.2)
+ : Math.floor(item.price * obj.growth);
+
+ this.$set(item, "growth", growth);
+ });
+ console.log(this.OneattrValue);
+ console.log(this.ManyAttrValue);
+ },
onChangeSpecs(item) {
if (item == 1 || (item == 2 && this.open_svip)) {
this.formThead.svip_price = { title: "付费会员价" };
@@ -4399,8 +4443,9 @@ export default {
extend: info.extend || [],
svip_price_type: info.svip_price_type || 0,
qualification:
- info.qualification || Object.assign({}, defaultObj.qualification)
- // is_huimei:info.is_huimei
+ info.qualification || Object.assign({}, defaultObj.qualification),
+ is_huimei: info.is_huimei || 0,
+ is_benefit: info.is_benefit || 0
};
console.log(info.qualification);
if (info.svip_price_type != 0 && info.mer_svip_status)
diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue
index 751006e..90aa2f9 100644
--- a/src/views/product/productList/index.vue
+++ b/src/views/product/productList/index.vue
@@ -342,12 +342,17 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="store_name" label="惠美乡村产品" min-width="230">
+ <el-table-column prop="store_name" label="惠美乡村产品" min-width="100">
<template slot-scope="scope">
{{ scope.row.is_huimei ? "是" : "否" }}
</template>
</el-table-column>
- <el-table-column prop="is_customize" label="定制产品" min-width="70">
+ <el-table-column prop="store_name" label="特惠专区产品" min-width="100">
+ <template slot-scope="scope">
+ {{ scope.row.is_benefit ? "是" : "否" }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="is_customize" label="定制产品" min-width="80">
<template slot-scope="scope">
{{ scope.row.is_customize ? "是" : "否" }}
</template>
diff --git a/src/views/product/productList/proDetails.vue b/src/views/product/productList/proDetails.vue
index 7d16a1d..ee74312 100644
--- a/src/views/product/productList/proDetails.vue
+++ b/src/views/product/productList/proDetails.vue
@@ -196,6 +196,12 @@
{{ productData.is_huimei ? "是" : "否" }}
</div>
</li>
+ <li class="item">
+ <div class="item-title">特惠专区产品：</div>
+ <div class="value">
+ {{ productData.is_benefit ? "是" : "否" }}
+ </div>
+ </li>
</ul>
<ul v-if="productData.video_link" class="list">
<li class="item item100">