From cae1adcf830feb214e1dc3183da5171d3028a0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Tue, 5 Nov 2024 17:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=93=BE=E6=8E=A5,=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/linkaddress/index.vue  | 25 ++++++++++++++++++++++++-
 src/views/order/list/orderDetails.vue |  8 ++++++++
 src/views/user/list/userDetails.vue   |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/components/linkaddress/index.vue b/src/components/linkaddress/index.vue
index f4ef211..bfcbcdc 100644
--- a/src/components/linkaddress/index.vue
+++ b/src/components/linkaddress/index.vue
@@ -50,6 +50,27 @@
 							</el-col>
 						</el-row>
 					</el-form>
+					<el-form
+						ref="formValidate"
+						:model="formValidate"
+						class="tabform"
+						label-width="80px"
+						@submit.native.prevent
+						v-if="currenType=='merchant'"
+					>
+						<el-row type="flex">
+							<el-col>
+								<el-form-item label="商户名称：">
+									<el-input placeholder="请输入商户名称" size="small" class="selWidth" v-model="formValidate.merchant_name" @keyup.enter.native="userSearchs"/>
+								</el-form-item>
+							</el-col>
+							<el-col>
+								<el-form-item label="商户ID：">
+									<el-input placeholder="请输入ID" size="small" class="selWidth" v-model="formValidate.merchant_id" @keyup.enter.native="userSearchs"/>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
 					<el-table
 						ref="table"
 						size="mini"
@@ -420,7 +441,9 @@
 					pageLink(this.categoryId, {
 						page: this.formValidate.page,
 						limit: this.formValidate.limit,
-						type: this.type
+						type: this.type,
+						merchant_id:this.formValidate.merchant_id,
+						merchant_name:this.formValidate.merchant_name
 					}).then(res=>{
 						this.loading = false
 						let data = res.data;
diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue
index 22cd6b7..74ea954 100644
--- a/src/views/order/list/orderDetails.vue
+++ b/src/views/order/list/orderDetails.vue
@@ -292,6 +292,14 @@
                           ? "助力"
                           : orderDetailList.activity_type == 4
                           ? "拼团"
+                          : orderDetailList.activity_type == 51
+                          ? "特惠"
+                          : orderDetailList.activity_type == 52
+                          ? "惠美"
+                          : orderDetailList.activity_type == 53
+                          ? "双十一活动"
+                          : orderDetailList.activity_type == 54
+                          ? "全折扣"
                           : "普通"
                       }}
                     </div>
diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue
index 5155773..98282f4 100644
--- a/src/views/user/list/userDetails.vue
+++ b/src/views/user/list/userDetails.vue
@@ -230,7 +230,7 @@
                   </li>
                   <li class="item">
                     <div>绑定时间：</div>
-                    <div class="value">{{ psInfo.spread.activation_time }}</div>
+                    <div class="value">{{ psInfo.activation_time }}</div>
                   </li>
                   <li class="item">
                     <div>邀请时间：</div>