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

uni_applet/pageA/enter/myCateringdustry/index.vue

@@ -18,80 +18,83 @@
 
 				<view>
 					<view class='caution' v-if='currectData.status!="显示中"&&currectData.status!="已隐藏"'>
-						{{currectData.status}}</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>
+						{{currectData.status}}
 					</view>
 				</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)'>
-						团购（{{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 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 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>
+				<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)'>
+							团购（{{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>
+
 						</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 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>
-		</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-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 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='merchants_unable_button'>店铺设置
+			<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>
-			<view v-if='currectData.status=="已驳回"'></view>
-			<view v-if='currectData.status=="已驳回"' class='merchants_button' @click='editCateringindustry'>编辑店铺信息</view>
-			<view v-if='currectData.status=="已驳回"'></view>
+			<u-picker immediateChange='true' title='选择店铺' @cancel='show = false' @confirm='shopConfirm' :show="show"
+				:columns="columns" keyName="shopNames"></u-picker>
 		</view>
-		<u-picker immediateChange='true' title='选择店铺' @cancel='show = false' @confirm='shopConfirm' :show="show"
-			:columns="columns" keyName="shopNames"></u-picker>
-	</view>
 </template>
 
 <script>

uni_applet/pageA/my/my.vue

@@ -1,45 +1,48 @@
 <template>
 	<view>
-		<u-tabbar
-			:value="tabbarCheck"
-			@change="tabbarChange"
-			activeColor="#5F7DE9"
-		>
+		<view class="head">
+			<image src="../../static/mic.png" mode="" style="width: 100rpx;height: 100rpx;"></image>
+			<view class="nickname">
+				昵称
+			</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>
+						<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>
+				</view>
+				
+			</view>
+		</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>
+				<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>
@@ -49,19 +52,24 @@
 	export default {
 		data() {
 			return {
-				tabbarCheck:'user',
+				tabbarCheck: 'user',
 			}
 		},
 		methods: {
-			tabbarChange(e){
+			toPage(){
+				uni.switchTab({
+					url:"/pages/food/food"
+				})
+			},
+			tabbarChange(e) {
 				console.log(e)
-				if(e=='team'){
+				if (e == 'team') {
 					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
@@ -70,6 +78,12 @@
 	}
 </script>
 
-<style>
-
-</style>
+<style scoped lang="scss">
+	.head{
+		background: #fff;
+	}
+	.content{
+		background: #fff;
+		margin-top: 20rpx;
+	}
+</style>

uni_applet/pages.json

@@ -313,8 +313,7 @@
 				"path": "notice/index",
 				"style": {
 					"navigationBarTitleText": "通知",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
+					"enablePullDownRefresh": false
 				}
 
 			}, {
@@ -328,8 +327,8 @@
 				"path": "my/my",
 				"style": {
 					"navigationBarTitleText": "我的",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
+					"enablePullDownRefresh": false
+					// "navigationStyle": "custom"
 				}
 
 			}, {

uni_applet/pages/food/food.vue

@@ -578,8 +578,18 @@
 			font-size: 24rpx;
 		}
 	}
-	.tag-type1{
-		margin: 20rpx 0
+	.tag-type1 {
+		margin: 20rpx 0;
+		.text {
+			border-radius: 4px;
+			background-color: #FDF2E5;
+			color: #E95700;
+			margin-right: 30rpx;
+			padding: 10rpx 26rpx;
+			font-size: 24rpx;
+			margin-right: 20rpx;
+		}
+	
 	}
 	.tag-type {
 		// margin: 20rpx 0;

uni_applet/pages/my/my.vue

@@ -316,7 +316,7 @@
 		border-bottom-style: solid;
 		width: 100%;
 		border-color: #d6d7d9;
-		padding: 20rpx 30rpx;
+		padding: 20rpx 22rpx;
 		box-sizing: border-box;
 	}