选择链接,活动类型

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;

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>

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>