From 0432814995fa6c449f606a362fdf6bf08faa1d32 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 18 Apr 2024 15:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=9C=A8=E6=80=BB=E5=B9=B3=E5=8F=B0=E6=94=AF=E6=8C=81=E7=BB=91?=
=?UTF-8?q?=E5=AE=9A=E7=9C=81=E5=85=AC=E5=8F=B8=E5=8F=91=E8=B5=B7=E4=BA=BA?=
=?UTF-8?q?=E5=8F=8A=E8=AE=BE=E7=BD=AE=E7=9C=81=E5=85=AC=E5=8F=B8=E9=97=A8?=
=?UTF-8?q?=E5=BA=97=E6=8F=90=E6=88=90=E9=87=91=E9=A2=9D=E5=92=8C=E4=BE=9B?=
=?UTF-8?q?=E5=BA=94=E5=95=86=E6=8F=90=E6=88=90=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../marketing/agent/agent/template/edit.vue | 2 +-
src/views/product/productExamine/index.vue | 65 ++++++++++++++-----
2 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/src/views/marketing/agent/agent/template/edit.vue b/src/views/marketing/agent/agent/template/edit.vue
index 48af01e..782fbc8 100644
--- a/src/views/marketing/agent/agent/template/edit.vue
+++ b/src/views/marketing/agent/agent/template/edit.vue
@@ -871,7 +871,7 @@ export default {
let agentType = currentAgent.agent_type || 0;
let selectedMerIds = {};// 当前代理已选中商户ID列表
let keyName = '';
- if(agentType == 7){
+ if(agentType == 7 || agentType == 2){
// 餐厅绑定商户变更
selectedMerIds = Number(currentAgent.mer_id) > 0 ? [currentAgent.mer_id] : {};
keyName = 'mer';
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index ed31ab7..b0f6e6d 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -190,7 +190,7 @@
-
+
@@ -206,6 +206,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -299,19 +310,14 @@ import infoFrom from './info'
import ueditorFrom from '@/components/ueditorFrom'
import previewBox from '@/components/previewBox/index'
import proDetail from './proDetails.vue';
-const proOptions = [{
- name: '热门榜单',
- value: 'is_hot'
-}, {
- name: '促销单品',
- value: 'is_benefit'
-}, {
- name: '精品推荐',
- value: 'is_best'
-}, {
- name: '首发新品',
- value: 'is_new'
-}]
+import {agentList} from "@/api/marketing";
+import {merchantListApi} from "@/api/merchant";
+const proOptions = [
+ {name: '热门榜单', value: 'is_hot'},
+ {name: '促销单品', value: 'is_benefit'},
+ {name: '精品推荐', value: 'is_best'},
+ {name: '首发新品', value: 'is_new'}
+]
export default {
name: 'ProductExamine1',
components: {
@@ -371,7 +377,10 @@ export default {
store_name: '',
rank: '',
us_status: '',
- star: 0
+ star: 0,
+ agent_two_ids: [],
+ agent_two_money: 0,
+ supplier_money: 0,
},
productStatusList: [
{ label: "上架显示", value: 1 },
@@ -424,7 +433,8 @@ export default {
isBatch: false,
labelForm: {},
recommendForm: {},
- drawer: false
+ drawer: false,
+ agent_list: [],
}
},
mounted() {
@@ -433,6 +443,7 @@ export default {
this.getCategorySelect()
this.getLstFilterApi()
this.getLabelLst()
+ this.getAgentList(2);
},
methods: {
subSuccess() {
@@ -556,7 +567,10 @@ export default {
content: info.content,
store_name: info.store_name,
rank: info.rank,
- star: info.star
+ star: info.star,
+ agent_two_ids: info.agent_two_ids || [],
+ agent_two_money: info.agent_two_money || 0,
+ supplier_money: info.supplier_money || 0,
}
if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
if(info.is_hot === 1) this.checkboxGroup.push('is_hot')
@@ -744,7 +758,21 @@ export default {
handleSizeChange(val) {
this.tableFrom.limit = val
this.getList('')
+ },
+ // 获取代理列表
+ getAgentList(agentType){
+ let _this = this;
+ let params = {
+ page: 1,
+ limit: 100,
+ agent_type: agentType,
+ };
+ agentList(params).then((res) => {
+ _this.agent_list = res.data.list || {};
+ }).catch((res) => {});
}
+
+
}
}
@@ -903,4 +931,7 @@ table .el-image {
text-align: justify!important;
display: inline-flex;
}
+.width100{
+ width: 100% !important;
+}