From 8c70aa238f07f96dae7fa6a1c099dc6acfd7b449 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 30 Aug 2024 20:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue               | 19 +++++++++++++------
 pages/news1/MerchantSettlement.vue | 27 ++++++++++++---------------
 pages/news1/MerchantSupplier.vue   | 28 ++++++++++++++--------------
 pages/user/index.vue               |  3 ++-
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 40d7ffe..998d28b 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -270,8 +270,8 @@
 				searchText: '',
 				banrdType: [],
 				keyName1: '',
-				isBanrdActive: '',
-				isActive: '',
+				isBanrdActive: 0,
+				isActive: 0,
 				goodsType: [],
 				keyName2: '',
 				showView: false, // 列表显示方式 (true列表、false平铺)
@@ -346,7 +346,7 @@
 			handleSortType1() {
 				this.factoryShow = true
 			},
-			actionSheetCallback(index){
+			actionSheetCallback(index) {
 				this.is_grad = index;
 				// this.$refs.uWaterfall1.clear();
 				this.factoryShow = false;
@@ -397,6 +397,7 @@
 				})
 			},
 			onChage(item, type, index) {
+				console.log(item)
 				if (type == 1) {
 					if (this.tabbar && this.tabbar[index].children && this.tabbar[index].children.length > 0) {
 						this.goodsType = this.tabbar[index].children;
@@ -473,15 +474,21 @@
 				if (this.keyName2) {
 					keywords.push(this.keyName2)
 				}
+				let categoryId = 0
+				if (this.isActive) {
+					categoryId = this.isActive
+				} else {
+					categoryId = this.isBanrdActive >0? this.isBanrdActive : ((app.options.categoryId || app.options.categoryId != undefined) ? app.options
+						.categoryId : 0)
+				}
 				const param = {
 					sortType: app.sortType != 'city' ? app.sortType : '',
 					sortPrice: Number(app.sortPrice),
-					categoryId: (app.options.categoryId || app.options.categoryId != undefined) ? app.options
-						.categoryId : 0,
+					categoryId:categoryId,
 					merchantId: app.options.merchantId,
 					// goodsName: app.options.search || '',
 					page: pageNo,
-					keywords: keywords.length > 0 ? keywords.join(',') : '',
+					// keywords: keywords.length > 0 ? keywords.join(',') : '',
 					keyword: app.options.search || '',
 					is_grad: app.is_grad
 					// goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
diff --git a/pages/news1/MerchantSettlement.vue b/pages/news1/MerchantSettlement.vue
index f720b52..9aa9da8 100644
--- a/pages/news1/MerchantSettlement.vue
+++ b/pages/news1/MerchantSettlement.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="settlement">
-		<view class="topContent">
-			<view class="topFont">商家入驻信息采集，请认真填写提交</view>
-			<view style="margin-top:22upx">通过审核后会有专人联系</view>
+		<view class="topContent" :style="{backgroundImage:`url(${indexBackgroundImage})`}">
+			<!-- <view class="topFont">商家入驻信息采集，请认真填写提交</view>
+			<view style="margin-top:22upx">通过审核后会有专人联系</view> -->
 		</view>
 		<view class="formContent">
 			<u-form :model="form" ref="uForm">
@@ -114,7 +114,7 @@
 		</view>
 		<view class="subBox">
 			<view class="submitBtn" @click="sureSubmit">
-				提交
+				立即入驻
 			</view>
 		</view>
 
@@ -143,6 +143,7 @@
 	export default {
 		data() {
 			return {
+				indexBackgroundImage: 'https://www.amiami.com.cn/static/shangjia/chengyaohezuo.png',
 				brand_name: '',
 				authorize_name: '',
 				rate_name: '',
@@ -494,15 +495,10 @@
 		padding-bottom: 134upx;
 
 		.topContent {
-			height: 232upx;
-			background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
-			font-size: 32upx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: bold;
-			color: #FFFFFF;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
+			height: 420rpx;
+			width: 100%;
+			background-size: 100% auto;
+			background-size: cover;
 
 			.topFont {
 				margin: 50upx 0 22upx;
@@ -610,13 +606,14 @@
 			width: 694rpx;
 			margin-left: 28rpx;
 			height: 104upx;
-			background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
+			font-size: 28rpx;
+			color: #002280;
+			background: #D9E8FF;
 			border-radius: 52px;
 			opacity: 1;
 			font-size: 32upx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
-			color: #FFFFFF;
 			display: flex;
 			align-items: center;
 			justify-content: center;
diff --git a/pages/news1/MerchantSupplier.vue b/pages/news1/MerchantSupplier.vue
index 8d3c11a..36bce7f 100644
--- a/pages/news1/MerchantSupplier.vue
+++ b/pages/news1/MerchantSupplier.vue
@@ -13,11 +13,11 @@
 			</view>
 			<view class="park-dui">
 				<image :src="$picUrl+'/static/shangjia/march.png'" mode=""></image>
-				<text>商品极速推广</text>
+				<text>精准活跃用户</text>
 			</view>
 			<view class="park-dui">
 				<image :src="$picUrl+'/static/shangjia/march.png'" mode=""></image>
-				<text>商品极速推广</text>
+				<text>成就品质店铺</text>
 			</view>
 		</view>
 		<view class="park-explain">
@@ -62,10 +62,10 @@
 					<view class="name">
 						合作品类
 					</view>
-					<view class="describe">
-						大小家电、建材家具、智能家居
-						灯饰卫浴、家纺布艺、电子教育
-						网红礼品、电脑办公、收集表环
+					<view class="describe" style="text-align: left;">
+						大小家电、建材家具、智能家居、
+						灯饰卫浴、家纺布艺、电子教育、
+						网红礼品、电脑办公、手机表环、
 						个护清洁、美妆护肤、运动户外
 					</view>
 				</view>
@@ -95,25 +95,25 @@
 						流量加权扶持
 					</view>
 					<view class="describe">
-						0门槛报名营销 活动推广
+						核心优选位流量曝光
 					</view>
 				</view>
 				<view class="new">
 					<image style="height: 64rpx;" :src="$picUrl+'/static/shangjia/describe_two.png'" mode=""></image>
 					<view class="name">
-						流量加权扶持
+						专属运营对接
 					</view>
 					<view class="describe">
-						0门槛报名营销 活动推广
+						官方定制快速成长计划
 					</view>
 				</view>
 				<view class="new">
 					<image style="height: 64rpx;" :src="$picUrl+'/static/shangjia/describe_there.png'" mode=""></image>
 					<view class="name">
-						流量加权扶持
+						0门槛活动推广
 					</view>
 					<view class="describe">
-						0门槛报名营销 活动推广
+						0门槛报名营销活动推广
 					</view>
 				</view>
 			</view>
@@ -243,7 +243,7 @@
 			// 构建页面参数
 			const params = this.$getShareUrlParams()
 			return {
-				title: '整点秒杀会场',
+				title: '诚挚邀请，欢迎入驻！',
 				path: `/pages/news1/MerchantSupplier`
 			}
 		},
@@ -448,13 +448,13 @@
 		.park-button {
 			width: 686rpx;
 			height: 88rpx;
-			background: #D9E8FF;
 			border-radius: 44rpx;
 			margin: 32rpx auto 0 auto;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 400;
 			font-size: 28rpx;
 			color: #002280;
+			background: #D9E8FF;
 			line-height: 88rpx;
 			text-align: center;
 			font-style: normal;
@@ -619,7 +619,7 @@
 
 				.box {
 					overflow: hidden;
-					width: calc(50% - 64rpx);
+					width: 50%;
 					padding: 0 32rpx 40rpx 32rpx;
 
 					.box-img {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 6633345..6a20e6c 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1175,6 +1175,7 @@
 				});
 			},
 			goMember(type) {
+				console.log('啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦')
 				if (this.isLogin == false) {
 					this.goLogin();
 					return;
@@ -1185,7 +1186,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: "/pages/member/index?type=" + type,
+						url: "/pages/invite/upgrade?type=" + type,
 					});
 				}
 			},