From 7707c44cf0e6bacba0cb7183e1f9d0c713e7b3e0 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 15 May 2024 18:33:47 +0800
Subject: [PATCH] edit
---
src/api/merchant.js | 6 +
.../merchant/list/handle/merEditForm.vue | 12 ++
src/views/merchant/list/index.vue | 55 ++++++-
src/views/product/productExamine/editAttr.vue | 149 ++++++++++++++++--
src/views/product/productExamine/index.vue | 26 +++
src/views/product/productExamine/info.vue | 7 +-
.../product/productExamine/proDetails.vue | 3 +-
src/views/user/list/index.vue | 4 +-
8 files changed, 238 insertions(+), 24 deletions(-)
diff --git a/src/api/merchant.js b/src/api/merchant.js
index 5a391cc..8d8fb41 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -19,6 +19,12 @@ export function merchantMenuCreateApi() {
export function merchantMenuUpdateApi(id) {
return request.get(`merchant/menu/update/form/${id}`)
}
+/**
+ * @description 签署 -- 签署链接
+ */
+export function merchantContactApi(id) {
+ return request.get(`system/merchant/contact/${id}`)
+}
/**
* @description 商户权限管理 -- 删除
*/
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 430e994..e6debd7 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -111,6 +111,18 @@
/>
+
+
+
+
+
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index fc0857a..3d56d07 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -94,9 +94,9 @@
-
+
+
+
+
+
+
+
{{ scope.row.is_soldier == 1 ? "是" : "否" }}
+
+
+ {{ scope.row.is_new == 1 ? "是" : "否" }}
+
+
{{ scope.row.is_store_mgr == 1 ? "是" : "否" }}
+
+
+ {{ scope.row.is_sign == 1 ? "是" : "否" }}
+
+
-
+
-
+
登录
+ 签署
{
+ this.$message.success(res.message);
+ window.open(res.message)
+ })
+ .catch((res) => {
+ this.$message.error(res.message);
+ });
+ },
onLogo(id) {
merchantLoginApi(id)
.then((res) => {
diff --git a/src/views/product/productExamine/editAttr.vue b/src/views/product/productExamine/editAttr.vue
index 421f914..85d8576 100644
--- a/src/views/product/productExamine/editAttr.vue
+++ b/src/views/product/productExamine/editAttr.vue
@@ -60,7 +60,20 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -110,7 +123,15 @@
-
+
+
+
+
+
@@ -149,7 +170,15 @@
-
+
+
+
+
+
@@ -219,6 +248,7 @@ const defaultObj = {
cost: 0,
ot_price: 0,
proportion:0.6,
+ coupon:'',
stock: 0,
growth:0,
bar_code: '',
@@ -239,6 +269,9 @@ const objTitle = {
proportion: {
title: '占比'
},
+ coupon:{
+ title:'抵扣卷'
+ },
stock: {
title: '库存'
},
@@ -260,6 +293,74 @@ export default {
components: {},
data() {
return {
+ proportionList:[
+ {
+ value: '0.60',
+ label: '0.60',
+ coupon:0.3,
+ growth:0.5
+ },
+ {
+ value: '0.55',
+ label: '0.55',
+ coupon:0.35,
+ growth:0.55
+ },
+ {
+ value: '0.50',
+ label: '0.50',
+ coupon:0.4,
+ growth:0.6
+ },
+ {
+ value: '0.45',
+ label: '0.45',
+ coupon:0.45,
+ growth:0.65
+ },
+ {
+ value: '0.40',
+ label: '0.40',
+ coupon:0.5,
+ growth:0.7
+ },
+ {
+ value: '0.35',
+ label: '0.35',
+ coupon:0.55,
+ growth:0.75
+ },
+ {
+ value: '0.30',
+ label: '0.30',
+ coupon:0.6,
+ growth:0.8
+ },
+ {
+ value: '0.25',
+ label: '0.25',
+ coupon:0.65,
+ growth:0.85
+ },
+ {
+ value: '0.20',
+ label: '0.20',
+ coupon:0.7,
+ growth:0.9
+ },
+ // {
+ // value: '0.15',
+ // label: '0.15',
+ // coupon:0.75,
+ // growth:0.95
+ // },
+ // {
+ // value: '0.1',
+ // label: '0.10',
+ // coupon:0.8,
+ // growth:1
+ // },
+ ],
product_id: '',
roterPre: roterPre,
modals: false,
@@ -294,6 +395,7 @@ export default {
price: 0,
cost: 0,
proportion:0.6,
+ coupon:'',
growth:0,
ot_price: 0,
stock: 0,
@@ -309,6 +411,7 @@ export default {
image: '',
price: 0,
proportion:0.6,
+ coupon:'',
growth:0,
cost: 0,
ot_price: 0,
@@ -343,18 +446,34 @@ export default {
},
methods: {
+ // 占比值变化处理
+ proportionChange(val,i,e){
+ val.cost = (val.price * e).toFixed(2)
+ let obj = this.proportionList.find(item=>item.value==e)
+ val.coupon = Math.floor(val.price*obj.coupon)
+ val.growth = Math.floor(val.price*obj.growth)
+ },
+ BatchProportionChange(){
+ this.oneFormBatch[0].cost = (this.oneFormBatch[0].price * this.oneFormBatch[0].proportion).toFixed(2)
+ let obj = this.proportionList.find(item=>item.value==this.oneFormBatch[0].proportion)
+ this.oneFormBatch[0].coupon = Math.floor(this.oneFormBatch[0].price*obj.coupon)
+ this.oneFormBatch[0].growth = Math.floor(this.oneFormBatch[0].price*obj.growth)
+ },
handleOnform(type){
if(type=='ot_price'){
this.oneFormBatch[0].ot_price = this.oneFormBatch[0].ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
}else if(type=='cost'){
this.oneFormBatch[0].cost = this.oneFormBatch[0].cost.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
- this.oneFormBatch[0].growth = parseInt( this.oneFormBatch[0].price*(0.9-( this.oneFormBatch[0].cost/ this.oneFormBatch[0].price)))
- this.oneFormBatch[0].proportion = (this.oneFormBatch[0].cost/this.oneFormBatch[0].price).toFixed(2)
-
+ // this.oneFormBatch[0].growth = parseInt( this.oneFormBatch[0].price*(0.9-( this.oneFormBatch[0].cost/ this.oneFormBatch[0].price)))
+ // this.oneFormBatch[0].proportion = (this.oneFormBatch[0].cost/this.oneFormBatch[0].price).toFixed(2)
}else{
this.oneFormBatch[0].price = this.oneFormBatch[0].price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
- this.oneFormBatch[0].growth = parseInt( this.oneFormBatch[0].price*(0.9-( this.oneFormBatch[0].cost/ this.oneFormBatch[0].price)))
- this.oneFormBatch[0].proportion = (this.oneFormBatch[0].cost/this.oneFormBatch[0].price).toFixed(2)
+ this.oneFormBatch[0].cost = (this.oneFormBatch[0].price * this.oneFormBatch[0].proportion).toFixed(2)
+ let obj = this.proportionList.find(item=>item.value==this.oneFormBatch[0].proportion)
+ this.oneFormBatch[0].coupon = Math.floor(this.oneFormBatch[0].price*obj.coupon)
+ this.oneFormBatch[0].growth = Math.floor(this.oneFormBatch[0].price*obj.growth)
+ // this.oneFormBatch[0].growth = parseInt( this.oneFormBatch[0].price*(0.9-( this.oneFormBatch[0].cost/ this.oneFormBatch[0].price)))
+ // this.oneFormBatch[0].proportion = (this.oneFormBatch[0].cost/this.oneFormBatch[0].price).toFixed(2)
}
},
@@ -371,9 +490,8 @@ export default {
switch(i){
case 'cost':
val.cost=val.cost.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
+ // val.proportion = (val.cost/val.price).toFixed(2)
// val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
- val.proportion = (val.cost/val.price).toFixed(2)
- val.growth = parseInt(val.price*0.5)
break;
case 'ot_price':
val.ot_price=val.ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
@@ -383,8 +501,10 @@ export default {
break;
case 'price':
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
- val.proportion = (val.cost/val.price).toFixed(2)
- val.growth = parseInt(val.price*0.5)
+ let obj = this.proportionList.find(item=>item.value==val.proportion)
+ val.cost = (val.price * val.proportion).toFixed(2)
+ val.coupon = Math.floor(val.price*obj.coupon)
+ val.growth = Math.floor(val.price*obj.growth)
break;
case 'growth':
val.growth=val.growth.replace(/[^\d]/g,'')
@@ -400,6 +520,7 @@ export default {
image: '',
price: 0,
proportion:0.6,
+ coupon:'',
growth:0,
cost: 0,
ot_price: 0,
@@ -422,6 +543,7 @@ export default {
this.$set(val, 'volume', this.oneFormBatch[0].volume)
this.$set(val, 'growth', this.oneFormBatch[0].growth)
this.$set(val, 'proportion', this.oneFormBatch[0].proportion)
+ this.$set(val, 'coupon', this.oneFormBatch[0].coupon)
this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
}
@@ -480,6 +602,7 @@ export default {
cost: 0,
ot_price: 0,
proportion:0.6,
+ coupon:'',
stock: 0,
growth:0,
bar_code: '',
@@ -513,6 +636,7 @@ export default {
cost: 0,
ot_price: 0,
proportion:0.6,
+ coupon:'',
stock: 0,
growth:0,
bar_code: '',
@@ -554,6 +678,7 @@ export default {
image: '',
price: 0,
proportion:0.6,
+ coupon:'',
growth:0,
cost: 0,
ot_price: 0,
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 0e349ac..c86dcc4 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -168,6 +168,22 @@
clearable
/>
+
+
+