From 15aa38b0d228e0dcbf4d4412fc8c10683a58e261 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 23 May 2024 17:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=A3=85=E4=BF=AE?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=80=89=E6=8B=A9=20-=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/linkaddress/index.vue       | 76 +++++++++++++++-------
 src/views/product/productExamine/index.vue |  7 ++
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/components/linkaddress/index.vue b/src/components/linkaddress/index.vue
index 4df11ef..7702cb7 100644
--- a/src/components/linkaddress/index.vue
+++ b/src/components/linkaddress/index.vue
@@ -21,7 +21,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="right_box" v-if="currenType=='special' || currenType=='product_category' || currenType=='points_cate' || currenType=='product' || currenType=='seckill' ||currenType=='presell' || currenType == 'bargain' || currenType == 'combination' || currenType == 'news' || currenType == 'active' || currenType == 'merchant' || currenType == 'micro'">
+				<div class="right_box" v-if="currenType=='special' || currenType == 'article_cate' || currenType=='product_category' || currenType=='points_cate' || currenType=='product' || currenType=='seckill' ||currenType=='presell' || currenType == 'bargain' || currenType == 'combination' || currenType == 'news' || currenType == 'active' || currenType == 'merchant' || currenType == 'micro'">
 					<el-form
 						ref="formValidate"
 						:model="formValidate"
@@ -66,11 +66,11 @@
 						</el-table-column>
 						<el-table-column key="2" prop="id" label="ID" min-width="60">
 						<template slot-scope="scope">
-							<span>{{scope.row.id || scope.row.product_id || scope.row.group_data_id || scope.row.mer_id || scope.row.article_id || scope.row.store_category_id}}</span>
+							<span>{{scope.row.id || scope.row.product_id || scope.row.group_data_id || scope.row.mer_id || scope.row.article_id || scope.row.store_category_id || scope.row.article_category_id}}</span>
 						</template>
 						</el-table-column>
-						<el-table-column v-if="currenType=='special' || currenType=='micro'" key="3" :prop="currenType=='special' ? 'title' : 'name'" label="页面名称" min-width="100" />
-						<el-table-column v-if="currenType=='special'" key="4"  prop="url" label="页面链接" min-width="150" />
+						<el-table-column v-if="currenType=='special' || currenType == 'article_cate' || currenType=='micro'" key="3" :prop="(currenType=='special' || currenType == 'article_cate') ? 'title' : 'name'" label="页面名称" min-width="100" />
+						<el-table-column v-if="currenType=='special' || currenType == 'article_cate'" key="4"  prop="url" label="页面链接" min-width="150" />
 						<el-table-column v-if="currenType=='product_category' || currenType=='points_cate'" key="5"  prop="cate_name" label="分类名称" min-width="60" />
 						<el-table-column v-if="currenType=='product_category'" key="6" label="分类图标" min-width="150">
 							<template slot-scope="scope">
@@ -111,7 +111,7 @@
 						<el-table-column v-if="currenType=='news'" key="12"  prop="title" label="文章名称" min-width="60" />
 						<el-table-column v-if="currenType=='active'" key="13"  prop="value.name" label="专场名称" min-width="150" />
 						<el-table-column v-if="currenType=='merchant'" key="14"  prop="mer_name" label="商户名称" min-width="150" />
-						<el-table-column v-if="currenType !=='merchant' && currenType !=='active' && currenType !=='news' && currenType !=='bargain' && currenType !=='combination' && currenType !=='product_category' && currenType!=='points_cate' && currenType !=='special' && currenType !=='micro'"  key="15" label="商品图片" min-width="80">
+						<el-table-column v-if="currenType !=='merchant' && currenType !=='active' && currenType !=='news' && currenType !=='bargain' && currenType !=='combination' && currenType !=='product_category' && currenType!=='points_cate' && currenType !=='special' && currenType !== 'article_cate' && currenType !=='micro'"  key="15" label="商品图片" min-width="80">
 							<template slot-scope="scope">
 								<div class="demo-image__preview">
 									<el-image style="width: 36px; height: 36px" :src="scope.row.image" :preview-src-list="[scope.row.image]" />
@@ -328,7 +328,8 @@
 								this.loading = false;
 								this.$message.error(res.message);
 							});
-				}else if(this.currenType == 'seckill'){
+				}
+        else if(this.currenType == 'seckill'){
 					let formValidate = this.formValidate
 					formValidate.product_type = 1;
 					getProduct(formValidate)
@@ -345,7 +346,8 @@
 								this.loading = false;
 								this.$message.error(res.message);
 							});
-				}else if(this.currenType == 'bargain'){
+				}
+        else if(this.currenType == 'bargain'){
 					let formValidate = this.formValidate
 					formValidate.product_type = 3;
 					getProduct(formValidate)
@@ -362,7 +364,8 @@
 								this.loading = false;
 								this.$message.error(res.message);
 							});
-				}else if(this.currenType == 'combination'){
+				}
+        else if(this.currenType == 'combination'){
 					let formValidate = this.formValidate
 					formValidate.product_type = 4;
 					getProduct(formValidate)
@@ -379,7 +382,8 @@
 								this.loading = false;
 								this.$message.error(res.message);
 							});
-				}else if(this.currenType == 'presell'){
+				}
+        else if(this.currenType == 'presell'){
 					let formValidate = this.formValidate
 					formValidate.product_type = 2;
 					getProduct(formValidate)
@@ -396,7 +400,8 @@
 								this.loading = false;
 								this.$message.error(res.message);
 							});
-				}else if(this.currenType == 'news'){
+				}
+        else if(this.currenType == 'news'){
 					articleLstApi(this.formValidate).then(async res => {
 						let data = res.data
 						data.list.forEach((e)=>{
@@ -409,7 +414,8 @@
 						this.loading = false;
 						this.$message.error(res.message);
 					})
-				} else if (this.currenType == 'active' || this.currenType == 'merchant') {
+				}
+        else if (this.currenType == 'active' || this.currenType == 'merchant') {
 					pageLink(this.categoryId, {
 						page: this.formValidate.page,
 						limit: this.formValidate.limit,
@@ -418,14 +424,23 @@
 						this.loading = false
 						let data = res.data;
 						this.currentList = data;
-						if(this.currenType == 'special'){
-							let list = []
-							data.forEach((e)=>{
-								e.url = `/pages/news_details/index?id=${e.article_id}`
-								list.push(e)
-							});
-							this.tableList = list
-						}else if(this.currenType == 'product_category'){
+            if(this.currenType == 'special'){
+              let list = []
+              data.forEach((e)=>{
+                e.url = `/pages/news_details/index?id=${e.article_id}`
+                list.push(e)
+              });
+              this.tableList = list
+            }
+            else if(this.currenType == 'article_cate'){
+              let list = []
+              data.forEach((e)=>{
+                e.url = `/pages/news_list/index?cate_id=${e.article_category_id}`
+                list.push(e)
+              });
+              this.tableList = list
+            }
+            else if(this.currenType == 'product_category'){
 							data.forEach((e)=>{
 								if(e.hasOwnProperty('children')){
 									e.children.forEach((j)=>{
@@ -440,14 +455,16 @@
 								e.url = `/pages/columnGoods/goods_list/index?id=${e.store_category_id}&title=默认`
 							});
 							this.tableList = data
-						}else if(this.currenType == 'active'){
+						}
+            else if(this.currenType == 'active'){
 							data.list.forEach(item => {
 								item.id = item.group_data_id
 								item.url = `/pages/activity/topic_detail/index?id=${item.group_data_id}`
 							})
 							this.tableList = data.list
 							this.total = res.data.count
-						}else if(this.currenType == 'merchant'){
+						}
+            else if(this.currenType == 'merchant'){
 							data.list.forEach(item => {
 								item.id = item.mer_id
 								item.url = `/pages/store/home/index?id=${item.mer_id}`
@@ -498,7 +515,16 @@
 								list.push(e)
 							});
 							this.tableList = list
-						}else if(this.currenType == 'product_category' || this.currenType == 'points_cate'){
+						}
+            else if(this.currenType == 'article_cate'){
+              let list = []
+              data.list.forEach((e)=>{
+                e.url = `/pages/news_list/index?cate_id=${e.article_category_id}`
+                list.push(e)
+              });
+              this.tableList = list
+            }
+            else if(this.currenType == 'product_category' || this.currenType == 'points_cate'){
 							data.forEach((e)=>{
 								e.id = e.store_category_id
 								if(e.hasOwnProperty('children')){
@@ -522,14 +548,16 @@
 
 							});
 							this.tableList = data
-						}else if(this.currenType == 'active'){
+						}
+            else if(this.currenType == 'active'){
 							data.list.forEach(item => {
 								item.id = item.group_data_id
 								item.url = `/pages/activity/topic_detail/index?id=${item.group_data_id}`
 							})
 							this.tableList = data.list
 							this.total = res.data.count
-						}else if(this.currenType == 'merchant'){
+						}
+            else if(this.currenType == 'merchant'){
 							data.list.forEach(item => {
 								item.id = item.mer_id
 								item.url = `/pages/store/home/index?id=${item.mer_id}`
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index b0f6e6d..12ec025 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -211,6 +211,11 @@
             <el-option v-for="item in agent_list" :key="item.id" :label="item.province_name ? item.contact_name + '('+item.province_name+')' : item.contact_name" :value="String(item.id)" />
           </el-select>
         </el-form-item>
+        <el-form-item label="默认发货省公司门店：">
+          <el-select v-model.number="formValidate.agent_two_mer_id" placeholder="请选择" class="width100">
+            <el-option v-for="item in agent_list" v-if="item.mer_id > 0" :key="item.id" :label="item.province_name ? item.contact_name + '('+item.province_name+')' : item.contact_name" :value="Number(item.mer_id)" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="省公司门店提成金额：">
           <el-input-number v-model="formValidate.agent_two_money" placeholder="请输入省公司门店提成金额" class="selWidth"/>
         </el-form-item>
@@ -379,6 +384,7 @@ export default {
         us_status: '',
         star: 0,
         agent_two_ids: [],
+        agent_two_mer_id: '',
         agent_two_money: 0,
         supplier_money: 0,
       },
@@ -569,6 +575,7 @@ export default {
           rank: info.rank,
           star: info.star,
           agent_two_ids: info.agent_two_ids || [],
+          agent_two_mer_id: info.agent_two_mer_id || '',
           agent_two_money: info.agent_two_money || 0,
           supplier_money: info.supplier_money || 0,
         }