前端

uni_applet/pageA/enter/enter.vue

@@ -51,7 +51,7 @@
 				</u-modal>
 		<u-tabbar
 			:value="tabbarCheck"
-			@change="name => tabbarCheck = name"
+			@change="tabbarChange"
 			activeColor="#5F7DE9"
 		>
 			<u-tabbar-item name="team" text="加入">
@@ -259,11 +259,24 @@
 		
 		},
 		methods: {
+			tabbarChange(e){
+				console.log(e)
+				if(e=='notification'){
+					uni.navigateTo({
+						url:'/pageA/notice/index'
+					})
+				}else if(e=='user'){
+					uni.navigateTo({
+						url:'/pageA/my/my'
+					})
+				}
+				// name => tabbarCheck = name
+			},
 			async confirm(){
 				var data1=await this.updateUser()
 				if(data1.errno==200){
 					uni.setStorageSync("userInfo",this.userInfo)
-					return
+					this.editshow = false
 				}
 			},
 			
@@ -298,8 +311,7 @@
 						if(data1.errno==200){
 							uni.setStorageSync("userInfo",this.userInfo)
 							return
-						}
-							
+						}	
 					}
 					if(uni.getStorageSync("userInfo").foodEntry==0&&uni.getStorageSync("userInfo").homeEntry!=0&&uni.getStorageSync("userInfo").hotelEntry==0){
 						this.userInfo.autoModule='homeEntry'
@@ -361,7 +373,7 @@
 			},
 			updateUser(){
 				return new Promise((resolve, reject) => {
-					that.$request.baseRequest('admin.unimall.commonUserInfo', 'list', {
+					that.$request.baseRequest('admin.unimall.commonUserInfo', 'update', {
 					commonUserInfo:JSON.stringify(this.userInfo)
 				}, failres => {
 						reject(failres)

uni_applet/pageA/enter/myCateringdustry/shopSetting/editCertificate.vue

@@ -26,7 +26,7 @@
 				   @confirm="confirm"
 				    />
 			</u--form>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='submit' class="submit">提交</button>
 			</view>
 		</view>

uni_applet/pageA/enter/myCateringdustry/shopSetting/editFoodClassify.vue

@@ -12,7 +12,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="footer">
+		<view class="mercharts_footer">
 			<button @click='submit' class="submit">新增</button>
 		</view>
 		<u-modal :show="isSubmit" :content='content' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton

uni_applet/pageA/enter/myCateringdustry/shopSetting/editShopImage.vue

@@ -14,7 +14,7 @@
 					</u-upload>
 				</u-form-item>
 			</u--form>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='submit' class="submit">提交</button>
 			</view>
 		</view>

uni_applet/pageA/enter/myCateringdustry/shopSetting/editShopInformation.vue

@@ -42,7 +42,7 @@
 					<u-input inputAlign='right' maxlength="15" border='none' placeholder='输入详细地址，不超过15个字' v-model="currectData.detailedAddress" />
 				</u-form-item>
 			</u--form>
-			<view class="footer">
+			<view class="mercharts_footer">
 				<button @click='submit' class="submit">提交</button>
 			</view>
 			<u-modal :show="isSubmit" content='确定提交店铺信息？' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton

uni_applet/pageA/notice/index.vue

@@ -13,6 +13,48 @@
 			</view>
 		<!-- </mescroll-body> -->
 		<u-toast ref="uToast"></u-toast>
+		<u-tabbar
+			:value="tabbarCheck"
+			@change="tabbarChange"
+			activeColor="#5F7DE9"
+		>
+			<u-tabbar-item name="team" text="加入">
+				<image
+					class="u-page__item__slot-icon"
+					slot="active-icon"
+					src="@/static/image/nav-icon/antOutline-team Copy.png"
+				></image>
+				<image
+					class="u-page__item__slot-icon"
+					slot="inactive-icon"
+					src="@/static/image/nav-icon/antOutline-team.png"
+				></image>
+			</u-tabbar-item>
+			<u-tabbar-item name="notification" text="通知">
+				<image
+					class="u-page__item__slot-icon"
+					slot="active-icon"
+					src="@/static/image/nav-icon/md-notifications_none Copy.png"
+				></image>
+				<image
+					class="u-page__item__slot-icon"
+					slot="inactive-icon"
+					src="@/static/image/nav-icon/md-notifications_none.png"
+				></image>
+			</u-tabbar-item>
+			<u-tabbar-item name="user" text="我的">
+				<image
+					class="u-page__item__slot-icon"
+					slot="active-icon"
+					src="@/static/image/nav-icon/antOutline-user1 Copy.png"
+				></image>
+				<image
+					class="u-page__item__slot-icon"
+					slot="inactive-icon"
+					src="@/static/image/nav-icon/antOutline-user1.png"
+				></image>
+			</u-tabbar-item>
+		</u-tabbar>
 	</view>
 </template>
 
@@ -31,6 +73,19 @@
 		},
 		
 		methods:{
+			tabbarChange(e){
+				console.log(e)
+				if(e=='team'){
+					uni.navigateTo({
+						url:'/pageA/enter/enter'
+					})
+				}else if(e=='user'){
+					uni.navigateTo({
+						url:'/pageA/my/my'
+					})
+				}
+				// name => tabbarCheck = name
+			},
 			getList(){
 				var that = this
 				uni.showLoading({

uni_applet/pages/my/my.vue

@@ -90,8 +90,9 @@
 					    isLink
 					    url="/pages/componentsB/badge/badge"
 					></u-cell> -->
-					<view class="kf">
+					<view class="flex justify-space-between kf">
 						<button class="left-btn" open-type='contact'>联系客服</button>
+						<image style='width:22px;height:22px;' src="../../static/image/yjt.png" mode=""></image>
 					</view>
 
 					<u-cell :border='false' title="去商家端" isLink url="/pageA/enter/enter"></u-cell>
@@ -102,6 +103,48 @@
 		<!-- <view class="exit" @click="exit" v-if="userInfo.phone">
 			退出账号
 		</view> -->
+		<u-tabbar
+			:value="tabbarCheck"
+			@change="tabbarChange"
+			activeColor="#5F7DE9"
+		>
+			<u-tabbar-item name="team" text="加入">
+				<image
+					class="u-page__item__slot-icon"
+					slot="active-icon"
+					src="@/static/image/nav-icon/antOutline-team Copy.png"
+				></image>
+				<image
+					class="u-page__item__slot-icon"
+					slot="inactive-icon"
+					src="@/static/image/nav-icon/antOutline-team.png"
+				></image>
+			</u-tabbar-item>
+			<u-tabbar-item name="notification" text="通知">
+				<image
+					class="u-page__item__slot-icon"
+					slot="active-icon"
+					src="@/static/image/nav-icon/md-notifications_none Copy.png"
+				></image>
+				<image
+					class="u-page__item__slot-icon"
+					slot="inactive-icon"
+					src="@/static/image/nav-icon/md-notifications_none.png"
+				></image>
+			</u-tabbar-item>
+			<u-tabbar-item name="user" text="我的">
+				<image
+					class="u-page__item__slot-icon"
+					slot="active-icon"
+					src="@/static/image/nav-icon/antOutline-user1 Copy.png"
+				></image>
+				<image
+					class="u-page__item__slot-icon"
+					slot="inactive-icon"
+					src="@/static/image/nav-icon/antOutline-user1.png"
+				></image>
+			</u-tabbar-item>
+		</u-tabbar>
 		<login-pop-up ref='loginpopup' :content='"手机登录后才能查看我的哦~"'></login-pop-up>
 	</view>
 </template>
@@ -139,6 +182,19 @@
 			}
 		},
 		methods: {
+			tabbarChange(e){
+				console.log(e)
+				if(e=='team'){
+					uni.navigateTo({
+						url:'/pageA/notice/index'
+					})
+				}else if(e=='user'){
+					uni.navigateTo({
+						url:'/pageA/my/my'
+					})
+				}
+				// name => tabbarCheck = name
+			},
 			todetail(){
 				uni.navigateTo({
 					url:"/pageA/notice/index"