Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

# Conflicts:
#	uni_applet/pageA/enter/enter.vue

uni_applet/pageA/cxTable.vue

@@ -161,12 +161,12 @@
 			this.getLunar()
 		},
 		methods: {
-			setRowColor(){
-				for(let i = 1;i<this.tableList.length;i++){
-					this.tableList[i].false
+			setRowColor(){debugger
+				for(let i = 0;i<this.tableList.length;i++){
+					this.tableList[i].check=false
 					let _array = this.tableList[i].name.split("/")
 					if(this.day==_array[0]||this.day==_array[1]){
-						this.tableList[i+1].check = true
+						this.tableList[i].check = true
 					}
 				}
 			},
@@ -366,7 +366,7 @@
 			margin-top: 50rpx;
 			background: rgba(255, 255, 255, 0.7);
 			    padding: 20rpx;
-			    border: 1px solid #92b8f1;
+			   box-shadow: 2px 3px 3px 1px rgba(187, 187, 187, 0.4);
 			    border-radius: 20rpx;
 			.title{
 				font-size: 38rpx;

uni_applet/pageA/enter/enter.vue

@@ -1,94 +1,47 @@
 <template>
 	<view>
-		 <u-navbar
-		            title="入驻"
-		            placeholder='true'
-		        >
-		            <view
-		                class="u-nav-slot"
-		                slot="left"
-		            >
-		            </view>
-		        </u-navbar>
+		<u-navbar title="入驻" placeholder='true' :autoBack="true">
+		</u-navbar>
 		<view>
-			<u-swiper :list="fileList"
-			autoplay
-			imgMode='aspectFit'
-			height='200'
-			radius='0'
-			:circular="true"
-			@change="e => current = e.current" @click="click">
+			<u-swiper :list="fileList" autoplay radius='0' :circular="true"
+				@change="e => current = e.current" @click="click">
 				<view slot="indicator" class="indicator">
-					<view
-			            class="indicator__dot"
-			            v-for="(item, index) in fileList"
-			            :key="index"
-			            :class="[index === current && 'indicator__dot--active']">
-			        </view>
+					<view class="indicator__dot" v-for="(item, index) in fileList" :key="index"
+						:class="[index === current && 'indicator__dot--active']">
+					</view>
 				</view>
 			</u-swiper>
 		</view>
 		<view>
-			 <luyj-grid-link :list="list" @gridExc="clickGrid" @switchChange='switchChange'></luyj-grid-link>
+			<luyj-grid-link :list="list" @gridExc="clickGrid" @switchChange='switchChange'></luyj-grid-link>
 		</view>
-		<u-modal :show="editshow"  @confirm="$u.debounce(confirm,500)" title="选择自动跳转内容" >
-					<view class="slot-content">
-						<u-radio-group
-						    v-model="radiovalue1"
-						    placement="column"
-						    @change="groupChange"
-						  >
-						    <u-radio
-						      :customStyle="{marginBottom: '8px'}"
-						      v-for="(item, index) in radiolist1"
-						      :key="index"
-						      :label="item.value"
-						      :name="item.value"
-						    >
-						    </u-radio>
-						  </u-radio-group>
-					</view>
-				</u-modal>
-		<u-tabbar
-			:value="tabbarCheck"
-			@change="tabbarChange"
-			activeColor="#5F7DE9"
-		>
+		<u-modal :show="editshow" @confirm="$u.debounce(confirm,500)" title="选择自动跳转内容" @cancel="editshow=false" closeOnClickOverlay showCancelButton>
+			<view class="slot-content">
+				<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
+					<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
+						:label="item.value" :name="item.value">
+					</u-radio>
+				</u-radio-group>
+			</view>
+		</u-modal>
+		<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>
+				<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>
+				<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>
+				<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>
@@ -107,13 +60,13 @@
 		},
 		data() {
 			return {
-				fileList:[],
-				editshow:false,
-				tabbarCheck:'team',
-				showAuthorizePhone:false,
-				showAuthorizeUser:false,
-				radiolist1:[],
-				radiovalue1:'',
+				fileList: [],
+				editshow: false,
+				tabbarCheck: 'team',
+				showAuthorizePhone: false,
+				showAuthorizeUser: false,
+				radiolist1: [],
+				radiovalue1: '',
 				userInfo: {
 					head: '',
 					nickname: '',
@@ -134,94 +87,91 @@
 					fontSize: "32rpx",
 					background: "#5F7DE9"
 				},
-				list: [
-					{
-				        title: '全部分类',
-				        // cur: 'basic',
-				        bgColor: '', // 背景颜色
-				        color: 'blue',
-				        title_show: true,
-				        showAll: false,
-				        colNumber: 4, // 显示的列数
-				        iconsList: [
-							{
+				list: [{
+						title: '全部分类',
+						// cur: 'basic',
+						bgColor: '', // 背景颜色
+						color: 'blue',
+						title_show: true,
+						showAll: false,
+						colNumber: 4, // 显示的列数
+						iconsList: [{
 								cuIcon: '1_canyin-35',
 								color: 'blue',
 								name: '餐饮',
-								status:true,
+								status: true,
 								url: '/pageA/enter/cateringindustry'
 							},
 							{
 								cuIcon: 'zufang',
 								color: 'blue',
 								name: '民宿',
-								status:true,
+								status: true,
 								url: '/pageA/enter/homestay'
 							},
 							{
-				                cuIcon: 'jiudian-38',
-				                color: 'blue',
-				                name: '酒店',
-								status:true,
-				                 url: '/pageA/enter/hotel'
-				            }
-				        ]
-				    },
+								cuIcon: 'jiudian-38',
+								color: 'blue',
+								name: '酒店',
+								status: true,
+								url: '/pageA/enter/hotel'
+							}
+						]
+					},
 					{
 						title: '我的入驻',
 						// cur: 'basic',
 						bgColor: '', // 背景颜色
 						color: 'blue',
 						title_show: true,
-						foodEntry:0,
-						homeEntry:0,
-						hotelEntry:0,
-						switch:true,
+						foodEntry: 0,
+						homeEntry: 0,
+						hotelEntry: 0,
+						switch: true,
 						showAll: false,
-						switch_status:true,
+						switch_status: true,
 						colNumber: 4, // 显示的列数
-						iconsList: [
-							{
+						iconsList: [{
 								cuIcon: '1_canyin-35',
 								color: 'blue',
 								name: '餐饮',
-								status:true,
+								status: true,
 								url: '/pageA/enter/myCateringdustry/index'
 							},
 							{
 								cuIcon: 'zufang',
 								color: 'blue',
 								name: '民宿',
-								status:true,
+								status: true,
 								url: '/pageA/enter/myHomestay/index'
 							},
 							{
-						        cuIcon: 'jiudian-38',
-						        color: 'blue',
-						        name: '酒店',
-								status:true,
-						         url: '/pageA/enter/hotel'
-						    }
+								cuIcon: 'jiudian-38',
+								color: 'blue',
+								name: '酒店',
+								status: true,
+								url: '/pageA/enter/hotel'
+							}
 						]
-						},
-				    ], 
+					},
+				],
 			}
 		},
-		onLoad(){
+		onLoad() {
 			that = this
-			this.userInfo=uni.getStorageSync("userInfo")
-			if(uni.getStorageSync("userInfo").phone&&uni.getStorageSync("userInfo").automaticSkip){
-				if(uni.getStorageSync("userInfo").autoModule=='foodEntry'){
+			this.userInfo = uni.getStorageSync("userInfo")
+			if (uni.getStorageSync("userInfo").phone && uni.getStorageSync("userInfo").automaticSkip) {
+				if (uni.getStorageSync("userInfo").autoModule == 'foodEntry') {
 					uni.navigateTo({
-						url:'/pageA/enter/myCateringdustry/index'
+						url: '/pageA/enter/myCateringdustry/index'
 					})
-				}else if(uni.getStorageSync("userInfo").autoModule=='homeEntry'){
+				} else if (uni.getStorageSync("userInfo").autoModule == 'homeEntry') {
 					uni.navigateTo({
-						url:'/pageA/enter/myHomestay/index'
+						url: '/pageA/enter/myHomestay/index'
 					})
-				}else if(uni.getStorageSync("userInfo").autoModule=='hotelEntry'){
+				} else if (uni.getStorageSync("userInfo").autoModule == 'hotelEntry') {
 					uni.navigateTo({
-						url:'/pageA/enter/hotel'
+						url: '/pageA/enter/hotel'
 					})
 				}
 			}
@@ -230,152 +180,227 @@
 		onShow: function() {
 			let _isLoad = uni.getStorageSync("scanAddCardToIndex")
 			if (uni.getStorageSync("userInfo").phone) {
-				if(uni.getStorageSync("userInfo").foodEntry==0&&uni.getStorageSync("userInfo").homeEntry==0&&uni.getStorageSync("userInfo").hotelEntry==0){
-					this.list[1].switch_status=false
-				}else{
-					this.list[1].switch_status=uni.getStorageSync("userInfo").automaticSkip?true:false
+				if (uni.getStorageSync("userInfo").foodEntry == 0 && uni.getStorageSync("userInfo").homeEntry == 0 &&
+					uni.getStorageSync("userInfo").hotelEntry == 0) {
+					this.list[1].switch_status = false
+				} else {
+					this.list[1].switch_status = uni.getStorageSync("userInfo").automaticSkip ? true : false
 				}
-				if(uni.getStorageSync("userInfo").foodEntry>0){
-					this.list[1].iconsList[0].status=true
-				}else{
-					this.list[1].iconsList[0].status=false
+				if (uni.getStorageSync("userInfo").foodEntry > 0) {
+					this.list[1].iconsList[0].status = true
+				} else {
+					this.list[1].iconsList[0].status = false
 				}
-				if(uni.getStorageSync("userInfo").homeEntry>0){
-					this.list[1].iconsList[1].status=true
-					this.list[0].iconsList[1].status=false
-				}else{
-					this.list[1].iconsList[1].status=false
-					this.list[0].iconsList[1].status=true
+				if (uni.getStorageSync("userInfo").homeEntry > 0) {
+					this.list[1].iconsList[1].status = true
+					this.list[0].iconsList[1].status = false
+				} else {
+					this.list[1].iconsList[1].status = false
+					this.list[0].iconsList[1].status = true
 				}
-				if(uni.getStorageSync("userInfo").hotelEntry>0){
-					this.list[1].iconsList[2].status=true
-					this.list[0].iconsList[2].status=false
-				}else{
-					this.list[1].iconsList[2].status=false
-					this.list[0].iconsList[2].status=true
+				if (uni.getStorageSync("userInfo").hotelEntry > 0) {
+					this.list[1].iconsList[2].status = true
+					this.list[0].iconsList[2].status = false
+				} else {
+					this.list[1].iconsList[2].status = false
+					this.list[0].iconsList[2].status = true
 				}
-			} else {
-			}
-		
+			} else {}
+
 		},
 		methods: {
-			tabbarChange(e){
+			tabbarChange(e) {
 				console.log(e)
-				if(e=='notification'){
+				if (e == 'notification') {
 					uni.navigateTo({
-						url:'/pageA/notice/index'
+						url: '/pageA/notice/index'
 					})
-				}else if(e=='user'){
+				} else if (e == 'user') {
 					uni.navigateTo({
-						url:'/pageA/my/my'
+						url: '/pageA/my/my'
 					})
 				}
 				// name => tabbarCheck = name
 			},
-			async confirm(){
-				var data1=await this.updateUser()
-				if(data1.errno==200){
-					uni.setStorageSync("userInfo",this.userInfo)
+			async confirm() {
+				var data1 = await this.updateUser()
+				if (data1.errno == 200) {
+					uni.setStorageSync("userInfo", this.userInfo)
 					this.editshow = false
 				}
 			},
-			
-			groupChange(e){
+
+			groupChange(e) {
 				console.log(e)
-				if(e=='餐饮'){
-					this.userInfo.autoModule='foodEntry'
-				}else if(e=='民宿'){
-					this.userInfo.autoModule='homeEntry'
-				}else if(e=='酒店'){
-					this.userInfo.autoModule='hotelEntry'
+				if (e == '餐饮') {
+					this.userInfo.autoModule = 'foodEntry'
+				} else if (e == '民宿') {
+					this.userInfo.autoModule = 'homeEntry'
+				} else if (e == '酒店') {
+					this.userInfo.autoModule = 'hotelEntry'
 				}
-				
+
 			},
-			
-			async switchChange(e){
-				var status=e?1:0
-				console.log(e,111111)
-				this.userInfo.automaticSkip=status
-				var data=await this.updateUser()
-				console.log(data)
-				if(data.errno==200){
-					uni.setStorageSync("userInfo",this.userInfo)
-					uni.showToast({
-						icon: "none",
-						title: '已开启自动跳转',
-						duration: 3000
-					});	
-					if(uni.getStorageSync("userInfo").foodEntry!=0&&uni.getStorageSync("userInfo").homeEntry==0&&uni.getStorageSync("userInfo").hotelEntry==0){
-						this.userInfo.autoModule='foodEntry'
-						var data1=await this.updateUser()
-						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'
-						var data1=await this.updateUser()
-						if(data1.errno==200){
-							uni.setStorageSync("userInfo",this.userInfo)
-							return
+
+			async switchChange(e) {debugger
+				var status = e ? 1 : 0
+				console.log(e, 111111)
+				// this.userInfo.automaticSkip = status
+				// var data = await this.updateUser()
+				// console.log(data)
+				// if (data.errno == 200) {
+				// 	uni.setStorageSync("userInfo", this.userInfo)
+				// 	uni.showToast({
+				// 		icon: "none",
+				// 		title: '已开启自动跳转',
+				// 		duration: 3000
+				// 	});
+				// 	if (uni.getStorageSync("userInfo").foodEntry != 0 && uni.getStorageSync("userInfo").homeEntry ==
+				// 		0 && uni.getStorageSync("userInfo").hotelEntry == 0) {
+				// 		this.userInfo.autoModule = 'foodEntry'
+				// 		var data1 = await this.updateUser()
+				// 		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'
+				// 		var data1 = await this.updateUser()
+				// 		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 = 'hotelEntry'
+				// 		var data1 = await this.updateUser()
+				// 		if (data1.errno == 200) {
+				// 			uni.setStorageSync("userInfo", this.userInfo)
+				// 			return
+				// 		}
+				// 	}
+				// 	this.radiolist1 = []
+				// 	if (uni.getStorageSync("userInfo").foodEntry != 0) {
+				// 		this.radiolist1.push({
+				// 			value: '餐饮'
+				// 		})
+				// 	}
+				// 	if (uni.getStorageSync("userInfo").homeEntry != 0) {
+				// 		this.radiolist1.push({
+				// 			value: '民宿'
+				// 		})
+				// 	}
+				// 	if (uni.getStorageSync("userInfo").hotelEntry != 0) {
+				// 		this.radiolist1.push({
+				// 			value: '酒店'
+				// 		})
+				// 	}
+					if (e) {
+						if (uni.getStorageSync("userInfo").foodEntry != 0 && uni.getStorageSync("userInfo").homeEntry ==
+							0 && uni.getStorageSync("userInfo").hotelEntry == 0) {
+							this.userInfo.autoModule = 'foodEntry'
+							var data1 = await this.updateUser()
+							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='hotelEntry'
-						var data1=await this.updateUser()
-						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'
+							var data1 = await this.updateUser()
+							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 = 'hotelEntry'
+							var data1 = await this.updateUser()
+							if (data1.errno == 200) {
+								uni.setStorageSync("userInfo", this.userInfo)
+								return
+							}
+						}
+						this.radiolist1 = []
+						if (uni.getStorageSync("userInfo").foodEntry != 0) {
+							this.radiolist1.push({
+								value: '餐饮'
+							})
+						}
+						if (uni.getStorageSync("userInfo").homeEntry != 0) {
+							this.radiolist1.push({
+								value: '民宿'
+							})
+						}
+						if (uni.getStorageSync("userInfo").hotelEntry != 0) {
+							this.radiolist1.push({
+								value: '酒店'
+							})
 						}
-					}
-					this.radiolist1=[]
-					if(uni.getStorageSync("userInfo").foodEntry!=0){
-						this.radiolist1.push({value:'餐饮'})
-					}
-					if(uni.getStorageSync("userInfo").homeEntry!=0){
-						this.radiolist1.push({value:'民宿'})
-					}
-					if(uni.getStorageSync("userInfo").hotelEntry!=0){
-						this.radiolist1.push({value:'酒店'})
-					}
-					if(e){
 						this.editshow = true
+					}else{
+						this.userInfo.automaticSkip = status
+						var data = await this.updateUser()
+						console.log(data)
+						if (data.errno == 200) {
+							uni.setStorageSync("userInfo", this.userInfo)
+							uni.showToast({
+								icon: "none",
+								title: '已开关闭动跳转',
+								duration: 3000
+							});
+						} 
+						else {
+							uni.showToast({
+								icon: "none",
+								title: '自动跳转关闭失败',
+								duration: 3000
+							});
+							this.userInfo.automaticSkip = status == 0 ? false : true
+						}
+						
+						
+						
+						
+						
+						
+						
+						
+						
+						
 					}
-				}else{
-					uni.showToast({
-						icon: "none",
-						title: '自动跳转开启失败',
-						duration: 3000
-					});	
-					this.userInfo.automaticSkip = status == 0 ? false : true
-				}
+			
 			},
-			getList(){
-				 this.$request.baseRequest('admin.tourism.carouselManagement', 'list', {
+			getList() {
+				this.$request.baseRequest('admin.tourism.carouselManagement', 'list', {
 					page: 1,
 					limit: 9999,
-					classify:'商家版首页'
-				 }, failres => {
+					classify: '商家版首页'
+				}, failres => {
 					uni.showToast({
 						icon: "none",
 						title: failres.errmsg,
 						duration: 3000
-					});	
-				 }).then(res => {
-					this.fileList=res.data.items
-				 })
+					});
+				}).then(res => {
+					this.fileList = res.data.items
+				})
 			},
-			toDetail(url){
+			toDetail(url) {
 				uni.navigateTo({
-					url:url
+					url: url
 				})
 			},
-			updateUser(){
+			updateUser() {
 				return new Promise((resolve, reject) => {
 					that.$request.baseRequest('admin.unimall.commonUserInfo', 'update', {
-					commonUserInfo:JSON.stringify(this.userInfo)
-				}, failres => {
+						commonUserInfo: JSON.stringify(this.userInfo)
+					}, failres => {
 						reject(failres)
 					}).then(res => {
 						resolve(res)
@@ -387,7 +412,7 @@
 				that.userInfo.phone = await this.$request.getPhone(e, that.userInfo)
 				this.showAuthorizePhone = false
 				this.showAuthorizeUser = true
-			
+
 			},
 			async authUser(type) {
 				//同步信息，没有头像和昵称自动生成
@@ -419,7 +444,7 @@
 </script>
 
 <style lang="scss" scoped>
-.slot-content {
+	.slot-content {
 		width: 100%;
 	}
 
@@ -500,5 +525,10 @@
 	/deep/.u-popup__content {
 		border-radius: 20rpx !important;
 	}
+	/deep/.u-tabbar-item image {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
 	
 </style>

uni_applet/pageA/enter/myCateringdustry/index.vue

@@ -1,100 +1,102 @@
 <template>
 	<view class='content'>
-		<view class='wrap'>
-			<view class='flex align-items-flex-start justify-space-between'>
-				<view class="flex">
-					<view class="head_sculpture">
-						<u--image :showLoading="true" :src="currectData.coverImage" width="80rpx" height="80rpx"
-							shape="circle"></u--image>
-					</view>
-					<view>
-						<view @click='switchShop' style='font-size:28rpx;'>{{currectData.shopNames}}
-							<image src="@/static/image/yjt.png" mode=""
-								style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image>
-						</view>
-						<view style='color:#999;font-size:24rpx;'>{{currectData.detailedAddress}}</view>
-					</view>
+		<view class='flex align-items-flex-start justify-space-between'
+			style="background: #fff;padding: 20rpx 20rpx 0 20rpx;">
+			<view class="flex">
+				<view class="head_sculpture">
+					<u--image :showLoading="true" :src="currectData.coverImage" width="80rpx" height="80rpx"
+						shape="circle"></u--image>
 				</view>
-
 				<view>
-					<view class='caution' v-if='currectData.status!="显示中"&&currectData.status!="已隐藏"'>
-						{{currectData.status}}
+					<view @click='switchShop' style='font-size:28rpx;'>{{currectData.shopNames}}
+						<image src="@/static/image/yjt.png" mode=""
+							style="margin-left:10rpx;width:12rpx;height: 21rpx;"></image>
 					</view>
+					<view style='color:#999;font-size:24rpx;'>{{currectData.detailedAddress}}</view>
 				</view>
 			</view>
-			<view class='wrap'>
-				<view>
-					<view style='font-size:28rpx;'>店铺照片</view>
-					<view style='flex-wrap: wrap;' class='flex'>
-						<view class='shop_image' v-for='item in currectData.indoorImageArray'>
-							<u--image :showLoading="true" :radius='10' :src="item" width="100rpx"
-								height="100rpx"></u--image>
-						</view>
+
+			<view>
+				<view class='caution' v-if='currectData.status!="显示中"&&currectData.status!="已隐藏"'>
+					{{currectData.status}}
+				</view>
+			</view>
+		</view>
+		<view class='shop'>
+			<view style="padding: 20rpx;background: #fff;">
+				<view class="img-title">店铺照片</view>
+				<view style='flex-wrap: wrap;' class='flex'>
+					<view class='shop_image' v-for='item in currectData.indoorImageArray'>
+						<u--image :showLoading="true" :radius='10' :src="item" width="100rpx"
+							height="100rpx"></u--image>
 					</view>
 				</view>
-				<view style='margin:20rpx 0 30rpx;'>
-					<view class='switch_show flex' style='font-size:34rpx;'>
-						<view :class='showStatus==0?"active":""' @click='switchShow(0)'>
-							商品展示（{{currectData.displaysNum?currectData.displaysNum:0}}）</view>
-						<!-- <view :class='showStatus==1?"active":""' @click='switchShow(1)'>
+			</view>
+			<view class="product">
+				<view class='switch_show flex' style='font-size:34rpx;'>
+					<view :class='showStatus==0?"active":""' @click='switchShow(0)'>
+						商品展示（{{currectData.displaysNum?currectData.displaysNum:0}}）</view>
+					<!-- <view :class='showStatus==1?"active":""' @click='switchShow(1)'>
 							团购（{{currectData.groupNum?currectData.groupNum:0}}）
 						</view> -->
-					</view>
-					<view v-if='showStatus==0' style='font-size:28rpx;'>
-						<view v-for='item in  currectData.dishClassifyInfoList' v-show='item.dishesNum'>
-							<view class=='flex  justify-space-between'>
-								<view>{{item.classifyName}}（{{item.dishesNum}}）</view>
-								<view @click='up(item)' class="merchants_button">置顶</view>
-							</view>
-							<view style='flex-wrap: wrap;text-align:center;' class='flex'>
-								<view style='margin:10rpx;' v-for='item1 in item.foodDishesInfoList'>
-									<u--image :showLoading="true" :src="item1.dishImage" width="150rpx"
-										height="150rpx"></u--image>
-									<view>{{item1.dishName}}</view>
+				</view>
+				<view v-if='showStatus==0' style='font-size:28rpx;'>
+					<view v-for='item in currectData.dishClassifyInfoList' v-show='item.dishesNum'>
+						<view class='flex justify-space-between' style="margin: 20rpx 0;">
+							<view>{{item.classifyName}}（{{item.dishesNum}}）</view>
+							<view @click='up(item)'>置顶</view>
+						</view>
+						<view style='flex-wrap: wrap;justify-content: space-between;' class='flex'>
+							<view v-for='item1 in item.foodDishesInfoList' class="product-item">
+								<u--image :showLoading="true" :src="item1.dishImage" width="30vw"
+									height="30vw"></u--image>
+								<view class="text-content">
+									<view class="name">{{item1.dishName}}</view>
+									<view class="price">￥{{item1.dishPrice}}</view>
 								</view>
-							</view>
 
+							</view>
 						</view>
 
 					</view>
-					<view v-if='showStatus==1'>
-						<view style='margin:10rpx;' v-for='item1 in currectData.foodGroupInfoList'>
-							<u--image v-if='item1.showImage' :showLoading="true" :src="item1.showImage" :width="width"
-								:height="height"></u--image>
-							<view>{{item1.groupTitle}}</view>
-							<view class='flex justify-space-between align-item-center'>
-								<view>{{item1.groupPrice}}</view>
-								<view class='flex align-item-center'>
-									<view>已收{{item1.soldNum}}.</view>
-									<view>已用{{item1.usedNum}}.</view>
-									<view>待用{{item1.notUseNum}}</view>
-								</view>
+				</view>
+				<view v-if='showStatus==1'>
+					<view style='margin:10rpx;' v-for='item1 in currectData.foodGroupInfoList'>
+						<u--image v-if='item1.showImage' :showLoading="true" :src="item1.showImage" :width="width"
+							:height="height"></u--image>
+						<view>{{item1.groupTitle}}</view>
+						<view class='flex justify-space-between align-item-center'>
+							<view>{{item1.groupPrice}}</view>
+							<view class='flex align-item-center'>
+								<view>已收{{item1.soldNum}}.</view>
+								<view>已用{{item1.usedNum}}.</view>
+								<view>待用{{item1.notUseNum}}</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view v-if='currectData.status=="显示中"||currectData.status=="已隐藏"' style='margin:20rpx;'
-				class='flex justify-space-between'>
-				<view class='merchants_button' @click='addfood'>添加菜品</view>
-				<!-- <view class='merchants_button' @click='addGroupBuying'>添加团购</view> -->
-				<view class='merchants_button' @click='shopSetting'>店铺设置</view>
+		</view>
+		<view v-if='currectData.status=="显示中"||currectData.status=="已隐藏"' class='flex justify-space-between bottom-fixed'>
+			<view class='merchants_button' @click='addfood'>添加菜品</view>
+			<!-- <view class='merchants_button' @click='addGroupBuying'>添加团购</view> -->
+			<view class='merchants_button' @click='shopSetting'>店铺设置</view>
+		</view>
+		<view v-else style='margin:20rpx;' class='flex justify-space-between'>
+			<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='merchants_unable_button'>添加菜品
 			</view>
-			<view v-else style='margin:20rpx;' class='flex justify-space-between'>
-				<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='merchants_unable_button'>添加菜品
-				</view>
-				<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='merchants_unable_button'>添加团购
-				</view>
-				<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='merchants_unable_button'>店铺设置
-				</view>
-				<view v-if='currectData.status=="已驳回"'></view>
-				<view v-if='currectData.status=="已驳回"' class='merchants_button' @click='editCateringindustry'>编辑店铺信息
-				</view>
-				<view v-if='currectData.status=="已驳回"'></view>
+			<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='merchants_unable_button'>添加团购
+			</view>
+			<view v-if='currectData.status=="审核中"||currectData.status=="已禁用"' class='merchants_unable_button'>店铺设置
 			</view>
-			<u-picker immediateChange='true' title='选择店铺' @cancel='show = false' @confirm='shopConfirm' :show="show"
-				:columns="columns" keyName="shopNames"></u-picker>
+			<view v-if='currectData.status=="已驳回"'></view>
+			<view v-if='currectData.status=="已驳回"' class='merchants_button' @click='editCateringindustry'>编辑店铺信息
+			</view>
+			<view v-if='currectData.status=="已驳回"'></view>
 		</view>
+		<u-picker immediateChange='true' title='选择店铺' @cancel='show = false' @confirm='shopConfirm' :show="show"
+			:columns="columns" keyName="shopNames"></u-picker>
+	</view>
 </template>
 
 <script>
@@ -103,7 +105,12 @@
 		data() {
 			return {
 				dataList: [],
-				currectData: {},
+				currectData: {
+					coverImage: '',
+					shopNames: '',
+					detailedAddress: '',
+					status: ''
+				},
 				showStatus: 0,
 				show: false,
 				height: '',
@@ -201,12 +208,9 @@
 </script>
 
 <style lang='scss' scoped>
-	.wrap {
-		padding: 20rpx;
-	}
-
 	.head_sculpture {
-		padding: 0 20rpx 20rpx 0;
+		margin-right: 20rpx;
+		/* padding: 0 20rpx 20rpx 0; */
 	}
 
 	.shop_image {
@@ -219,4 +223,62 @@
 			color: #5F7DE9;
 		}
 	}
+
+	.shop {
+
+		/* margin-top: 20rpx;
+		background: red; */
+		.img-title {
+			font-weight: 700;
+			margin-bottom: 20rpx;
+
+		}
+	}
+
+	.product {
+		margin-top: 20rpx;
+		background: #fff;
+		padding: 20rpx;
+
+		.product-item {
+			margin-bottom: 20rpx;
+			background: rgba(255, 255, 255, 0.7);
+			box-shadow: 2px 3px 3px 1px rgba(187, 187, 187, 0.4);
+
+			border-radius: 20rpx;
+
+			.text-content {
+				padding: 10rpx;
+
+				.name {
+					font-weight: 700;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+					width: 27vw;
+				}
+
+				.price {
+					color: #F50808;
+				}
+			}
+		}
+	}
+
+	.merchants_button {
+		font-size: 32rpx;
+		padding: 10rpx 40rpx;
+	}
+	.content{
+		padding-bottom: 200rpx;
+	}
+	.bottom-fixed{
+		    position: fixed;
+		    bottom: 0;
+		    background: #fff;
+		    width: 100%;
+		    justify-content: space-evenly;
+		    padding: 40rpx;
+		
+	}
 </style>

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

@@ -2,7 +2,7 @@
 	<view class='content'>
 		<view class='wrap'>
 			<view v-for='item in foodInfomations'>
-				<view>{{item.classify}}</view>
+				<view style="font-weight: 700;margin-bottom: 20rpx;">{{item.classify}}</view>
 				<view style='margin:10rpx;' class='flex justify-space-between align-item-center' v-for='(item1,index) in item.data'>
 					<view class='flex align-item-center'>
 						<u-checkbox-group
@@ -22,14 +22,15 @@
 						</u-upload>
 						 <view>
 							 <view v-if='!item1.edit'>{{item1.dishName}}</view>
-							 <u--input v-else inputAlign='right' v-model="item1.dishName" placeholder="输入菜品名称" border="none"></u--input>
+							 <u--input v-else inputAlign='left' v-model="item1.dishName" placeholder="输入菜品名称" border="none"></u--input>
 							 <view v-if='!item1.edit'>{{item1.dishPrice}}</view>
-							 <u--input v-else inputAlign='right' v-model="item1.dishPrice" placeholder="输入菜品单价" border="none"></u--input>
+							 <u--input v-else inputAlign='left' v-model="item1.dishPrice" placeholder="输入菜品单价" border="none"></u--input>
 						 </view>
 					 </view>
 					<view>
 						<view v-if='!item1.edit' @click='edit(item1)' class='button1 button'>编辑</view>
 						<view v-if='item1.edit' @click='submit(item1)' class='button1 button'>确定</view>
+						{{item1.edit}}
 						<view v-if='item1.edit' @click='item1.edit = false' class='default_button'>取消</view>
 						<view v-if='!item1.edit' class='default_button'>置顶</view>
 					</view>
@@ -48,9 +49,9 @@
 				>
 			    </u-checkbox>
 			</u-checkbox-group>
-			<view class='flex align-item-center'>
-				<view @click='del' style='margin-right:10rpx;' class='caution_button'>删除</view>
-				<view @click='add' class='button'>添加</view>
+			<view class='flex align-item-center bottom'>
+				<view @click='del' style='margin-right:10rpx;' class='del btn'>删除</view>
+				<view @click='add' class='btn add'>添加</view>
 			</view>
 		</view>
 		<u-modal :show="isSubmit" content='确定删除菜品?' @confirm="$u.debounce(confirmSubmit, 500)" showCancelButton
@@ -269,5 +270,21 @@
 <style lang='scss' scoped>
 	.button1{
 		margin-bottom:20rpx;
+		width: 100rpx;
+	}
+	.bottom{
+		padding: 20rpx;
+		.btn{
+			padding: 10rpx 30rpx;
+			border-radius: 20rpx;
+		}
+		.del{
+			background: #F50808;
+			color: #fff;
+		}
+		.add{
+			background:#5F7DE9;
+			color: #fff;
+		}
 	}
 </style>

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

@@ -320,4 +320,11 @@
 	padding:20rpx;
 	font-weight:600;
 }
+	.mercharts_button {
+		font-size: 32rpx;
+		padding: 20rpx 40rpx;
+		background-color: #5F7DE9;
+		color: #fff;
+		border-radius: 20rpx;
+	}
 </style>

uni_applet/pageA/my/my.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="">
 		<view class="head">
 			<image src="../../static/mic.png" mode="" style="width: 100rpx;height: 100rpx;"></image>
 			<view class="nickname">
@@ -7,23 +7,16 @@
 			</view>
 		</view>
 		<view class="content">
-			<view class="contact">
-				<view class="row">
-					<view class="flex justify-space-between kf">
-						<button class="left-btn" open-type='contact'>联系客服</button>
+				<view class="row" style="border-bottom: 1px solid #d6d7d9;">
+						<button class="left-btn left" open-type='contact'>联系客服</button>
 						<u-icon name="arrow-right" color="#909399" size="16"></u-icon>
-					</view>
 				</view>
 				<view class="row" @click="toPage">
 					<view class="left">
 						去用户端
 					</view>
-					<view class="right">
-						>
-					</view>
+					<u-icon name="arrow-right" color="#909399" size="16"></u-icon>
 				</view>
-				
-			</view>
 		</view>
 		<u-tabbar :value="tabbarCheck" @change="tabbarChange" activeColor="#5F7DE9">
 			<u-tabbar-item name="team" text="加入">
@@ -80,10 +73,41 @@
 
 <style scoped lang="scss">
 	.head{
-		background: #fff;
+		    background: #fff;
+		    display: flex;
+		    justify-content: center;
+		    align-items: center;
+		    flex-direction: column;
+		    padding: 40rpx;
+			.nickname{
+				    margin-top: 30rpx;
+				    font-size: 32rpx;
+				    font-weight: bold;
+			}
 	}
 	.content{
 		background: #fff;
 		margin-top: 20rpx;
+			padding: 20rpx;
+		
+	}
+	.left-btn {
+		padding: 0;
+		margin: 0;
+		font-size: 15px;
+		height: 42rpx;
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+	}
+	
+	.left-btn:after {
+		border: none !important;
+	}
+	.row{
+		display: flex;
+		padding: 20rpx 0;
+		justify-content: space-between;
+		
 	}
 </style>

uni_applet/uni_modules/lxm-fold-link/luyj-grid-link/components/luyj-grid-link/luyj-grid-link.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view v-for="(item , i) in tabber_list" :key="i">
+	<view class="content">
+		<view v-for="(item , i) in tabber_list" :key="i" class="item">
 			<!-- 标题 -->
 			<view v-if="item.iconsList.length > 0 && item.title_show" class="cu-bar bg-white solid-top ">
 				<view class="action">
@@ -129,4 +129,10 @@
 .switchwrap{
 	margin-right:20rpx;
 }
+.cu-bar{
+	min-height: auto;
+}
+.solid-top{
+	padding-top: 20rpx;
+}
 </style>