调整页面样式

App.vue

@@ -28,12 +28,44 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
 /*每个页面公共css */
 .pages {
 	background: #F2F2F2;
 	min-height: 100vh;
 }
+	.uni-tabbar {
+		// tab 样式
+		// 背景色
+		background-color: rgba(57, 181, 74, 0.1) !important;
+
+		// tabBar 样式
+		// 上边框
+		.uni-tabbar-border {
+			background-color: #e54d42 !important; // tabBar 上边框的颜色
+		}
+
+		.uni-tabbar__item {
+
+			// tabBar 单项样式
+			height: 100rpx !important;
+
+			&:not(:last-child) {
+				border-right: 4rpx solid #eee;
+			}
+
+			.uni-tabbar__icon {
+				// tabBar 图标样式
+				width: 40rpx !important;
+				height: 40rpx !important;
+			}
+
+			.uni-tabbar__label {
+				// tabBar 文字样式
+				// color:yellow !important
+			}
+		}
+	}
 
 * {
 	box-sizing: border-box;

components/OrderQrCode/index.vue

@@ -10,8 +10,8 @@
 					</div>
 					<div class="qr_code" v-else>
 						<image mode="aspectFit" :src="'/static/imgs/erweimazhedang.png'" class="qr"></image>
-						<view class="status_text">——制作完成后才能扫哦——</view>
 					</div>
+					<view class="status_text">——制作完成后才能扫哦——</view>
 					<div class="flow_describe">
 						<view class="title">扫码流程</view>
 						<image :mode="'aspectFit'" class="flow_img" :src="'/static/imgs/saomaliucheng.png'"></image>
@@ -87,7 +87,7 @@ export default {
 			// console.log("order:"+JSON.stringify(this.orderInfo));
 			
 			if(this.showMask) {
-				this.qrCode = '/static/imgs/noQr.png';
+				this.qrCode = '';
 			} else {
 				this.qrCode = path;
 			}
@@ -118,13 +118,6 @@ export default {
 	margin: 32rpx  32rpx;
 	padding: 24rpx 0rpx 30rpx 0rpx;
 
-	.status_text {
-		font-size: 28rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		text-align: center;
-	}
 
 	.btns {
 		text-align: center;
@@ -160,7 +153,13 @@ export default {
 	margin: 32rpx;
 	padding-top: 40rpx;
 	padding-bottom: 25rpx;
-
+	.status_text {
+		font-size: 28rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+	}
 	.code {
 		font-size: 36rpx;
 		font-family: PingFangSC-Semibold, PingFang SC;
@@ -174,11 +173,14 @@ export default {
 		height: 510rpx;
 	}
 	.qr_code {
-		height: 314rpx;
+		height: 347rpx;
+		width: 353rpx;
 		display: block;
 		margin: 70rpx auto;
 		position: relative;
-		padding-bottom: 30rpx;
+		padding-bottom: 40rpx;
+		margin-bottom: 0rpx;
+		margin-left: 150rpx;
 	
 		.status_text {
 			font-size: 28rpx;
@@ -210,8 +212,8 @@ export default {
 
 		.flow_img {
 			padding:36rpx 32rpx 0rpx 32rpx;
-			width: 586rpx;
-			height: 223rpx;
+			width: 590rpx;
+			height: 244rpx;
 			display: block;
 		}
 	}

main.js

@@ -23,6 +23,23 @@ Vue.use(uView);
 Vue.prototype.$utils = utils;
 Vue.prototype.setPrice = (price) => price && Number(price).toFixed(2);
 
+
+// #ifdef MP-WEIXIN
+Vue.mixin({
+  methods:{
+      setTabBarIndex(index) {
+          if (typeof this.$mp.page.getTabBar === 'function' &&
+          this.$mp.page.getTabBar()) {
+              this.$mp.page.getTabBar().setData({
+                  selected: index
+              })
+          }
+      }
+  }
+})
+// #endif
+
+
 Vue.prototype.loginByPhoneNumber = (e) => {
   if (e.detail.errMsg == 'getPhoneNumber:ok') {
     User.getPhoneNumber(e);

menuSubPackage/pages/areaSelect/areaSelect.vue

@@ -29,7 +29,7 @@
             <view class="line"></view>
             <div class="dec">
                 <view :style="{'height':'34rpx'}" v-show="item.distance && item.distance!=-1"></view>
-                <view class="goshop"></view>
+                <view class="goshop">去品尝</view>
                 <view :style="{'height':'34rpx'}" class="distance" v-show="item.distance && item.distance!=-1">距离 {{ item.distance }}</view>
             </div>
         </div>
@@ -153,7 +153,14 @@ export default {
         .goshop {
             width: 167rpx;
             height: 64rpx;
-		    background: url('@/static/imgs/qupinchang.png') center center no-repeat;
+            background: #003AE9;
+            border-radius: 2rpx;
+            font-size: 24rpx;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #FFFFFF;
+            text-align: center;
+            line-height: 64rpx;
         }
 
         .distance {

menuSubPackage/pages/goodsDetail/goodsDetail.vue

@@ -137,7 +137,6 @@ export default {
 		this.goodInfo = goodsInfo;
 		console.log(JSON.parse(JSON.stringify(this.goodInfo)));
 
-
 		this.initInfo(this.goodInfo)
 	},
 	// watch:{
@@ -439,7 +438,6 @@ export default {
 
 		.div_item {
 			position: relative;
-			width: 120rpx;
 			height: 48rpx;
 			margin-right: 32rpx;
 			line-height: 48rpx;
@@ -465,6 +463,7 @@ export default {
 }
 
 .good-spec-rule-item {
+	padding: 0rpx 20rpx;
 	width: 100%;
 	height: 100%;
 	font-size: 24rpx;
@@ -474,7 +473,6 @@ export default {
 	display: inline-block;
 	margin: 0;
 	margin: 0;
-	padding: 0;
 	line-height: 50rpx;
 	border-radius: 0rpx;
 	border: none;
@@ -483,6 +481,7 @@ export default {
 
 	&.active {
 		font-weight: 400;
+		padding: 0rpx 20rpx;
 		background: #003AE9;
 		color: #fff;
 		border-radius: 0rpx;

mineSubPackage/pages/msg/index.vue

@@ -69,8 +69,8 @@ export default {
 	 margin-top: 311rpx;
 	
 	.empty_icon {
-		 width: 322rpx;
-		 height: 234rpx;
+		 width: 324rpx;
+		 height: 236rpx;
 		 
 	}
 	.empty_text {

orderSubPackage/pages/orderInfo/index.vue

 <template>
 	<div class="pages">
 		<div class="order_status">
-			<view class="status_text">{{ orderStatusText }}</view>
+			<view class="status_text">订单状态：{{ orderStatusText }}</view>
 			<view class="tips">
 				<view v-if="orderInfo.state == 7">为保持口感，请尽快引用哦~</view>
 				<view v-if="orderInfo.state == 4">订单已制作完成，请尽快取餐~</view>
+				<view v-if="orderInfo.state == 2 || orderInfo.state == 3">请您耐心等候，预计<text class="time">3</text>分钟后可取</view>
 			</view>
 			<div class="btns">
 				<a type="primary" @click="cancelOrder" v-if="orderInfo.state == 1" class="btn_cancel">取消订单</a>
@@ -20,8 +21,8 @@
 			</div>
 			<div v-if="qrShow&&!isBuild" class="qr_code" >
 				<image mode="aspectFit" :src="'/static/imgs/erweimazhedang.png'" class="qr"></image>
-				<view class="status_text">——制作完成后才能扫哦——</view>
 			</div>
+			<view class="status_text">——制作完成后才能扫哦——</view>
 			<canvas v-if="qrShow" class="canvas-code" canvas-id="myQrcode"
 				style="background:#fff;width: 200px;height: 200px; display:block; left:-800rpx;position:absolute;" />
 			<div v-if="qrShow" class="flow_describe">
@@ -311,10 +312,19 @@ export default {
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
 		color: #999999;
+
+		
+		.time {
+			font-size: 32rpx;
+			font-family: Futura Medium, Arial, sans-serif;
+			font-weight: normal;
+			color: #003AE9;
+			margin: 0 16rpx;
+		}
 	}
 
 	.btns {
-		margin-top: 26rpx;
+		padding-top: 26rpx;
 		text-align: center;
 		width: 428rpx;
 		display: flex;
@@ -355,6 +365,14 @@ export default {
 	margin: 32rpx;
 	padding-top: 55rpx;
 
+	.status_text {
+		font-size: 32rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+	}
+
 	.code {
 		text-align: center;
 		font-size: 32rpx;
@@ -364,21 +382,15 @@ export default {
 	}
 
 	.qr_code {
-		height: 314rpx;
+		height: 347rpx;
+		width: 353rpx;
 		display: block;
 		margin: 92rpx auto;
 		position: relative;
+		padding-bottom: 40rpx;
+		margin-bottom: 0rpx;
+		margin-left: 150rpx;
 
-		.status_text {
-			margin-top: 40rpx;
-			text-align: center;
-			font-size: 28rpx;
-			font-family: PingFangSC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #666666;
-			line-height: 40rpx;
-			letter-spacing: 1rpx;
-		}
 		.qr {
 			width: 100%;
 			height: 100%;
@@ -395,7 +407,6 @@ export default {
 	}
 
 	.flow_describe {
-		width: 100%;
 		height: 300rpx;
 		padding-left: 32rpx;
 		background: #FFFFFF;
@@ -412,8 +423,8 @@ export default {
 
 		.flow_img {
 			padding:36rpx 32rpx 0rpx 32rpx;
-			width: 586rpx;
-			height: 223rpx;
+			width: 590rpx;
+			height: 244rpx;
 			display: block;
 		}
 	}

pages/menu/menu.vue

@@ -296,22 +296,6 @@ export default {
 				Utils.getallNum(itemCopy);
 			}
 			return
-			// if (!sku) {
-			// 	this.showToast({ title: '本商品已经售罄', icon: 'none' });
-			// 	return;
-			// } else {
-			// 	if(sku.isDefault != 1){
-			// 		this.showToast({ title: '默认规格已售罄,已添加其他规格', icon: 'none' });
-			// 	}
-			// 	itemCopy.skus = [sku];
-			// 	itemCopy.sku = sku
-			// 	itemCopy.skuId = sku?.skuId
-			// 	itemCopy.num = 1;
-			// 	itemCopy.flag = true;
-			// 	itemCopy.categoryId = category.id;
-			// 	itemCopy.goodsName = category.name;
-			// 	Utils.getallNum(itemCopy);
-			// }
 		},
 		goToMyPage(logined) {
 			logined && uni.switchTab({ url: '/pages/mine/mine' })

pages/mine/mine.vue

@@ -202,7 +202,7 @@ button::after {
 
 .contents {
 	display: flex;
-	padding: 40rpx;
+	padding: 52rpx 52rpx 52rpx 70rpx;
 	margin: 16rpx 32rpx 26rpx 32rpx;
 	align-items: center;
 	justify-content: space-between;
@@ -210,15 +210,15 @@ button::after {
 	// background: #0000FF;
 
 	.myOrder {
-		width: 36%;
+		width: 30%;
 		height: 197rpx;
 		// background: #FF0000;
 		background: #FFFFFF;
 		align-items: center;
-		text-align: center;
+		text-align: left;
 		
 		.text {
-			margin-top: 16rpx;
+			margin-top: 5rpx;
 			font-size: 28rpx;
 			font-family: PingFangSC-Medium, PingFang SC;
 			font-weight: 500;
@@ -234,10 +234,10 @@ button::after {
 		}
 
 		.icon {
-			width: 72rpx;
-			height: 80rpx;
+			width: 94rpx;
+			height:110rpx;
 			margin: 0 auto;
-			margin-top: 50rpx;
+			margin-top: 38rpx;
 		}
 	}
 
@@ -262,7 +262,7 @@ button::after {
 		.box_two {
 			width: 100%;
 			overflow: initial;
-			height: 129rpx;
+			height: 69rpx;
 			// background: #FF0000;
 			background: #FFFFFF;
 			display: flex;
@@ -291,8 +291,8 @@ button::after {
 		
 			.right {
 				.icon {
-					width: 80rpx;
-					height: 72rpx;
+					width: 91rpx;
+					height: 69rpx;
 				}
 			}
 		}
@@ -300,7 +300,7 @@ button::after {
 			width: 306rpx;
 			height: 2rpx;
 			border: 1rpx solid #E4E4E4;
-			margin: 30rpx 0rpx;
+			margin: 34rpx 0rpx;
 		}
 		.box {
 			overflow: initial;
@@ -335,8 +335,8 @@ button::after {
 		
 			.right {
 				.icon {
-					width: 80rpx;
-					height: 72rpx;
+					width: 91rpx;
+					height: 61rpx;
 				}
 			}
 		}

pages/order/order.vue

@@ -236,8 +236,8 @@ export default {
 	 margin-top: 311rpx;
 	
 	.empty_icon {
-		 width: 322rpx;
-		 height: 234rpx;
+		 width: 324rpx;
+		 height: 236rpx;
 		 
 	}
 	.empty_text {
@@ -277,8 +277,8 @@ export default {
 	 transform: translate(-50%);
 	 margin-top: 311rpx;
 	 	.empty_icon {
-		 width: 322rpx;
-		 height: 234rpx;
+		 width: 324rpx;
+		 height: 236rpx;
 		 
 	}
 	.empty_text {