diff --git a/pages/invite/index.vue b/pages/invite/index.vue
index e0acbd2..338ceaa 100644
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@@ -102,9 +102,7 @@
 			<view class="story">
 				<scroll-view class="tabs" scroll-x>
 					<view class="story-box" v-for="(a,i) in storysList" :key="i" @click="previewImage(a.image_url)">
-						<image
-							:src="a.image_url"
-							style="height: 160rpx;" mode="aspectFill"></image>
+						<image :src="a.image_url" style="height: 160rpx;" mode="aspectFill"></image>
 						<view class="content">
 							{{a.successful}}
 						</view>
@@ -130,7 +128,8 @@
 		</view>
 		<view class="button-fixed" @click="openPage(1)" style="top: 470rpx;">邀<br>请<br>记<br>录
 		</view>
-		<view class="button-fixed" @click="openPage(5)" style="top: 630rpx;">立<br>即<br>升<br>级
+		<view v-if="userInfo.user_type!=30" class="button-fixed" @click="openPage(5)" style="top: 630rpx;">
+			立<br>即<br>升<br>级
 		</view>
 		<addShuiyin />
 	</view>
@@ -166,29 +165,25 @@
 				list: [],
 				devicePixelRatio: 750 / uni.getSystemInfoSync().windowHeight,
 				activity_rules: '',
-				storysList:[]
+				storysList: [],
 			}
 		},
 		onLoad(options) {},
 		onShow() {
-			if (uni.getStorageSync("AccessToken")) {
-				this.userInfo = uni.getStorageSync("userInfo");
-			} else {
-				this.userInfo = {}
-			}
+			this.userInfo = uni.getStorageSync("userInfo");
 		},
 		onReady() {
 			this.getCarousel()
 			this.getCarouselList()
 		},
 		methods: {
-			 previewImage(image_url) {
-			      // 调用预览图片API
-			      uni.previewImage({
-			        current: 0, // 当前显示图片索引
-			        urls: [image_url] // 需要预览的图片URL列表
-			      });
-			    },
+			previewImage(image_url) {
+				// 调用预览图片API
+				uni.previewImage({
+					current: 0, // 当前显示图片索引
+					urls: [image_url] // 需要预览的图片URL列表
+				});
+			},
 			getCarouselList() {
 				const app = this;
 				Api.getAgreement({
@@ -209,7 +204,7 @@
 				app.list = []
 				Api.storyList()
 					.then(result => {
-						this.storysList=result.data.list.data
+						this.storysList = result.data.list.data
 						console.log(this.storysList)
 					})
 					.finally(() => app.isLoading = false)
diff --git a/pages/invite/upgrade.vue b/pages/invite/upgrade.vue
index 6041ba9..8c80238 100644
--- a/pages/invite/upgrade.vue
+++ b/pages/invite/upgrade.vue
@@ -1,5 +1,8 @@
 <template>
 	<view class="park" :style="{backgroundImage:`url(${upgradeBackgroundImage})`}">
+		<view class="park-navbar">
+			<u-navbar title="升级服务商" :border-bottom="false" :background="background"></u-navbar>
+		</view>
 		<view class="park-box">
 			<image :src="$picUrl+'/static/shangjia/upgrade_top.png'" mode="" class="comma"></image>
 			<view class="name">
@@ -65,6 +68,9 @@
 	export default {
 		data() {
 			return {
+				background: {
+					background: 'none'
+				},
 				upgradeBackgroundImage: 'https://www.amiami.com.cn/static/shangjia/upgrade_bg.png?t=1',
 				adoption_num: 0,
 				popShow: false
@@ -124,7 +130,7 @@
 
 		.park-box {
 			width: 100%;
-			padding-top: 220rpx;
+			padding-top: 90rpx;
 			overflow: hidden;
 
 			.comma {
@@ -139,7 +145,6 @@
 				font-weight: bold;
 				font-size: 89rpx;
 				color: #222222;
-				line-height: 80rpx;
 				font-style: normal;
 				text-transform: none;
 				margin: 16rpx 0 16rpx 160rpx;
diff --git a/pages/news1/MerchantSettlement.vue b/pages/news1/MerchantSettlement.vue
index c09274f..f720b52 100644
--- a/pages/news1/MerchantSettlement.vue
+++ b/pages/news1/MerchantSettlement.vue
@@ -7,10 +7,10 @@
 		<view class="formContent">
 			<u-form :model="form" ref="uForm">
 				<view class="formSection">
-					<u-form-item label="*主体公司名称 ">
+					<u-form-item label="主体公司名称 " required>
 						<u-input border placeholder="请输入贵公司名称" v-model="form.store_name" />
 					</u-form-item>
-					<u-form-item label="*主营类目" @click="categoryShow = true">
+					<u-form-item label="主营类目" required @click="categoryShow = true">
 						<u-input border v-model="form.store_cat" placeholder="请选择主营类目" type="select"
 							@click="categoryShow = true" />
 						<u-picker :range="categoryList" range-key="text" @confirm="actionSheetCallback(1, $event)"
@@ -20,78 +20,78 @@
 					</u-form-item>
 				</view>
 				<view class="formSection">
-					<u-form-item label="*公司地址" @click="addrshow = true">
+					<u-form-item label="公司地址" required @click="addrshow = true">
 						<u-input border v-model="form.store_address" placeholder="请选择地址" type="select"
 							@click="addrshow = true" />
 						<u-picker mode="region" v-model="addrshow" @confirm="getAddress"></u-picker>
 					</u-form-item>
-					<u-form-item label="*合作品牌 ">
+					<u-form-item label="合作品牌 " required>
 						<u-input border placeholder="请输入" v-model="form.store_brand" />
 					</u-form-item>
-					<u-form-item label="*自有品牌/代理入驻" @click="bandShow = true">
+					<u-form-item label="自有品牌/代理入驻" required @click="bandShow = true">
 						<u-input border v-model="brand_name" placeholder="代理入驻" type="select"
 							@click="bandShow = true" />
 						<u-action-sheet :list="bandList" :cancel-btn="false" v-model="bandShow"
 							@click="actionSheetCallback(2, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*一级/二级授权" @click="levelShow = true">
+					<u-form-item label="一级/二级授权" required @click="levelShow = true">
 						<u-input border v-model="authorize_name" placeholder="一级授权" type="select"
 							@click="levelShow = true" />
 						<u-action-sheet :list="leveList" :cancel-btn="false" v-model="levelShow"
 							@click="actionSheetCallback(3, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*可否含税" @click="taxShow = true">
+					<u-form-item label="可否含税" required @click="taxShow = true">
 						<u-input border v-model="rate_name" placeholder="请选择" type="select" @click="taxShow = true" />
 						<u-action-sheet :list="taxList" :cancel-btn="false" v-model="taxShow"
 							@click="actionSheetCallback(4, $event)"></u-action-sheet>
 					</u-form-item>
 				</view>
 				<view class="formSection">
-					<u-form-item label="*联系人姓名 ">
+					<u-form-item label="联系人姓名 " required>
 						<u-input border placeholder="请输入姓名" v-model="form.user_name" />
 					</u-form-item>
-					<u-form-item label="*联系人职位" @click="contactShow = true">
+					<u-form-item label="联系人职位" @click="contactShow = true" required>
 						<u-input border v-model="form.user_position" placeholder="请选择" type="select"
 							@click="contactShow = true" />
 						<u-action-sheet :list="contactsList" :cancel-btn="false" v-model="contactShow"
 							@click="actionSheetCallback(5, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*联系人手机号">
+					<u-form-item label="联系人手机号" required>
 						<u-input border placeholder="请输入手机号" type="numer" v-model="form.user_mobile" />
 					</u-form-item>
-					<u-form-item label="*联系人微信号">
+					<u-form-item label="联系人微信号" required>
 						<u-input border placeholder="请输入微信号" v-model="form.user_wx" />
 					</u-form-item>
-					<u-form-item label="*联系人邮箱">
+					<u-form-item label="联系人邮箱" required>
 						<u-input border placeholder="请输入邮箱" v-model="form.user_email" />
 					</u-form-item>
 
 				</view>
 				<view class="formSection">
-					<u-form-item label="*仓储模式" @click="modeShow = true">
+					<u-form-item label="仓储模式" @click="modeShow = true" required>
 						<u-input border v-model="form.store_model" placeholder="请选择" type="select"
 							@click="modeShow = true" />
 						<u-action-sheet :list="modeList" :cancel-btn="false" v-model="modeShow"
 							@click="actionSheetCallback(6, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*周末是否发货" @click="sendShow = true">
+					<u-form-item label="周末是否发货" @click="sendShow = true" required>
 						<u-input border v-model="send_name" placeholder="请选择" type="select" @click="sendShow = true" />
 						<u-action-sheet :list="sendList" :cancel-btn="false" v-model="sendShow"
 							@click="actionSheetCallback(7, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*是否自有工厂" @click="factoryShow = true">
+					<u-form-item label="是否自有工厂" @click="factoryShow = true" required>
 						<u-input border v-model="factory_name" placeholder="请选择" type="select"
 							@click="factoryShow = true" />
 						<u-action-sheet :list="yesNotList" :cancel-btn="false" v-model="factoryShow"
 							@click="actionSheetCallback(8, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*是否有线下渠道" @click="yesnoShow = true">
+					<u-form-item label="是否有线下渠道" @click="yesnoShow = true" required>
 						<u-input border v-model="offline_name" placeholder="请选择" type="select"
 							@click="yesnoShow = true" />
 						<u-action-sheet :list="yesNotList" :cancel-btn="false" v-model="yesnoShow"
 							@click="actionSheetCallback(9, $event)"></u-action-sheet>
 					</u-form-item>
-					<u-form-item label="*是否有电商店铺" @click="storeShow = true">
+					<u-form-item label="是否有电商店铺" @click="storeShow = true" required>
 						<u-input border v-model="shop_name" placeholder="请选择" type="select" @click="storeShow = true" />
 						<u-action-sheet :list="yesNotList" :cancel-btn="false" v-model="storeShow"
 							@click="actionSheetCallback(10, $event)"></u-action-sheet>
@@ -625,7 +625,7 @@
 
 	.popcontent {
 		width: 520upx;
-		height: 486upx;
+		height: 450upx;
 		background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
 		border-radius: 6px 6px 6px 6px;
 		opacity: 1;
diff --git a/pages/news1/MerchantSupplier.vue b/pages/news1/MerchantSupplier.vue
index c277783..03d83a1 100644
--- a/pages/news1/MerchantSupplier.vue
+++ b/pages/news1/MerchantSupplier.vue
@@ -4,7 +4,7 @@
 			<u-navbar title="供应商入驻" :border-bottom="false" :background="background"></u-navbar>
 		</view>
 		<view class="park-title">
-			诚招优质正品货源商家 入驻 <text style="color: #222222;">卖货鸭</text>
+			诚招优质正品货源商家 入驻 <text style="color: #222;">{{storeInfo.store_name}}</text>
 		</view>
 		<view class="park-tips">
 			<view class="park-dui">
@@ -214,10 +214,12 @@
 				card_hold_imgage_ids: [],
 				prove_imgage_ids: [],
 				isCheckout: false,
+				storeInfo:''
 			}
 		},
 		onLoad(options) {
-			console.log(this.indexBackgroundImage)
+			this.storeInfo = JSON.parse(uni.getStorageSync("storeInfo"));
+			console.log(this.storeInfo)
 		},
 		onShow() {