From b329b072d62f5c36a7e4893029db2cd9c772d0b8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 17 Apr 2024 16:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=20=E4=BE=9B=E5=BA=94=E5=95=86=E7=BC=96=E8=BE=91=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=97=B6-=E6=8C=87=E5=AE=9A=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91=E7=9A=84=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/marketing.js                   |  4 ++++
 src/views/product/addProduct/index.vue | 29 +++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/api/marketing.js b/src/api/marketing.js
index de47655..54325ed 100644
--- a/src/api/marketing.js
+++ b/src/api/marketing.js
@@ -584,3 +584,7 @@ export function integralOrderLog(id, data) {
 export function integralMarkApi(id) {
   return request.get(`points/order/mark/${id}/form`)
 }
+// 代理中心 - 代理列表
+export function agentList(data) {
+  return request.get(`marketing/agent/list`, data)
+}
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index 5d48c66..8215591 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -6,8 +6,8 @@
           <el-tab-pane :name="'1'" label="商品信息" />
           <el-tab-pane :name="'2'" label="规格设置" />
           <el-tab-pane :name="'3'" label="商品详情" />
-          <el-tab-pane :name="'4'" label="营销设置" v-if="config.merchant_type != 2"/>
-          <el-tab-pane :name="'5'" label="积分设置" v-if="config.merchant_type != 2"/>
+          <el-tab-pane :name="'4'" label="营销设置" />
+          <el-tab-pane :name="'5'" label="积分设置" />
           <el-tab-pane :name="'6'" label="其他设置" />
           <el-tab-pane :name="'7'" label="购买协议" />
         </el-tabs>
@@ -33,7 +33,7 @@
                   ✓
                 </div>
               </div>
-              <div v-if="config.merchant_type != 2" class="virtual" :class="formValidate.type == 1 ? 'virtual_boder' : 'virtual_boder2'" @click="virtualbtn(1, 2)">
+              <div class="virtual" :class="formValidate.type == 1 ? 'virtual_boder' : 'virtual_boder2'" @click="virtualbtn(1, 2)">
                 <div class="virtual_top">虚拟商品</div>
                 <div class="virtual_bottom">(虚拟发货)</div>
                 <div v-if="formValidate.type == 1" class="virtual_san" />
@@ -244,7 +244,7 @@
               </template>
             </template>
           </el-col>
-          <el-col :span="24" v-if="config.merchant_type != 2">
+          <el-col :span="24">
             <el-form-item label="商品关键字：">
               <el-input
                 v-model="formValidate.keyword"
@@ -288,7 +288,7 @@
         </el-row>
         <!-- 规格设置 -->
         <el-row v-if="currentTab == '2'">
-          <el-col :span="24" v-if="config.merchant_type != 2">
+          <el-col :span="24">
             <el-form-item
               v-if="extensionStatus > 0"
               label="佣金设置："
@@ -303,7 +303,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="config.merchant_type != 2">
+          <el-col :span="24">
             <el-form-item
               v-if="open_svip"
               label="付费会员价设置："
@@ -969,7 +969,6 @@
               <span>为0或者空则使用商户默认设置（实际支付的金额 * 倍数）</span>
             </el-form-item>
           </el-col>
-
           <el-col :span="24">
             <el-form-item label="是否开启礼包：">
               <el-radio-group v-model="formValidate.is_gift_bag" :disabled="$route.params.id ? true : false">
@@ -1422,6 +1421,7 @@ import {getToken} from '@/utils/auth'
 import taoBao from './taoBao'
 import copyRecord from './copyRecord'
 import addCarMy from "./addCarMy";
+import {agentList} from "@/api/marketing";
 
 const defaultObj = {
   image: '',
@@ -1758,6 +1758,8 @@ export default {
         width: 95,
       },
       config: {},// 获取商户基本配置
+      // 代理列表获取
+      agent_list: {},
     }
   },
   computed: {
@@ -1822,6 +1824,7 @@ export default {
     this.getGuaranteeList()
     this.productGetRule()
     this.getLabelLst()
+    // this.getAgentList(2)
     this.$store.dispatch('settings/setEdit', true)
     this.formValidate.slider_image = []
     if (this.$route.params.id) {
@@ -2989,6 +2992,18 @@ export default {
         },
         38
       );
+    },
+    // 获取代理列表
+    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) => {});
     }
   }
 };