feat:排号说明修改

orderPages/bookService/index.vue

@@ -80,13 +80,16 @@
 <!--				<textarea v-model="orderParam.remark" placeholder-style="color:#999999;fontSize:28rpx"-->
 <!--					placeholder="如有其它特殊需求，请在此输入您的需求" />-->
 				<view class="serobReminder">
-					<text>1.预约需要一人一号</text>
+					<text>1.预约需要一人一号。</text>
 				</view>
 				<view class="serobReminder">
-					<text>2.目前支付费用为时段预约占位费</text>
+					<text>2.目前支付费用为时段预约占位费。</text>
 				</view>
 				<view class="serobReminder">
-					<text>3.服务费用到店享受相应服务以后在另行收取</text>
+					<text>3.服务费用到店享受相应服务以后在另行收取。</text>
+				</view>
+				<view class="serobReminder">
+					<text>4.到门店先签到，过时没有签到占位时段失效。</text>
 				</view>
 			</view>
 		</view>

orderPages/orderDetail/index.vue

@@ -111,16 +111,16 @@
 							</view>
 						</view>
 						<view class="flex-col justify-around">
-							<view class="flex-col justify-center " v-if="order.planNumber">
+							<view class="flex-col justify-center " v-if="item.planNumber">
 								<view class="planNumber flex-row justify-center">
-									<text>{{order.planNumber}}</text>
+									<text>{{item.planNumber}}</text>
 								</view>
-								<view class="plan flex-row justify-center" v-if="order.serviceAttribute == 1">
+								<view class="plan flex-row justify-center">
 									<text class="plan">排号</text>
 								</view>
-								<view class="plan flex-row justify-center" v-if="order.serviceAttribute == 2">
-									<text class="plan">预约号</text>
-								</view>
+<!--								<view class="plan flex-row justify-center" v-if="order.serviceAttribute == 2">-->
+<!--									<text class="plan">预约号</text>-->
+<!--								</view>-->
 							</view>
 
 							<view class="flex-row justify-center" v-if="item.status === 8" @click="appeal(item.orderServiceId)">

orderPages/storeService/index.vue

@@ -30,10 +30,16 @@
 				<text>取号规则</text>
 			</view>
 			<view class="serobReminder">
-				<text>1.预约需要一人一号</text>
+				<text>1.你已进入不挑师傅不挑时段的单剪造型占位理发服务。</text>
 			</view>
 			<view class="serobReminder">
-				<text>2.服务费用到店享受相应服务以后在另行收取</text>
+				<text>2.预约需要一人一号。</text>
+			</view>
+			<view class="serobReminder">
+				<text>3.到门店先签到，过时没有签到占位时段失效。</text>
+			</view>
+			<view class="serobReminder">
+				<text>4.服务费用到店享受相应服务以后在另行收取。</text>
 			</view>
 		</view>
 <!--		<view class="tabBarLineHeight "></view>-->

pages.json

@@ -387,13 +387,16 @@
 		}
 	],
 	"tabBar": {
-		"color": "#282828",
-		"selectedColor": "#B22338",
+		"color": "#999999",
+		"selectedColor": "#333333",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"selectedIconPath": "/static/tabBar/index_cur.png",
+				"iconPath": "/static/tabBar/index.png",
+				"text": "首页"
 			},
 //			{
 //				"pagePath": "pages/orderMeal/index"
@@ -402,10 +405,16 @@
 //				"pagePath": "pages/qrCode/index"
 //			},
 			{
-				"pagePath": "pages/order/index"
+				"pagePath": "pages/order/index",
+				"selectedIconPath": "/static/tabBar/order_cur.png",
+				"iconPath": "/static/tabBar/order.png",
+				"text": "订单"
 			},
 			{
-				"pagePath": "pages/my/index"
+				"pagePath": "pages/my/index",
+				"selectedIconPath": "/static/tabBar/me_cur.png",
+				"iconPath": "/static/tabBar/me.png",
+				"text": "我的"
 			}
 		]
 	},

pages/index/index.vue

@@ -103,7 +103,7 @@
               <!-- 左边内容 -->
               <view @click="gotoServiceOrder()" class="left-content">
                 <view class="title">
-                  今日预约
+                  当日排队
                 </view>
                 <view class="desc">
                   <!--									多种服务模式任您选择-->
@@ -227,9 +227,9 @@
       </view>
     </view>
 
-    <view class="tabBarView">
-      <tab-bar :tabIndex="tabIndex"></tab-bar>
-    </view>
+<!--    <view class="tabBarView">-->
+<!--      <tab-bar :tabIndex="tabIndex"></tab-bar>-->
+<!--    </view>-->
   </view>
 
 </template>
@@ -286,9 +286,9 @@ export default {
       console.log('param==============>',param)
     }
 
-    uni.hideTabBar({
-      animation: false
-    })
+    // uni.hideTabBar({
+    //   animation: false
+    // })
 
     if (e.scene){
       let scene = e.scene

pages/my/index.vue

@@ -92,12 +92,12 @@
       <!--					</uni-list>-->
       <!--				</view>-->
 
-      <view class="tabBarLineHeight"></view>
+<!--      <view class="tabBarLineHeight"></view>-->
 
-    </view>
-    <view class="tabBarView">
-      <tab-bar :tabIndex="tabIndex"></tab-bar>
-    </view>
+<!--    </view>-->
+<!--    <view class="tabBarView">-->
+<!--      <tab-bar :tabIndex="tabIndex"></tab-bar>-->
+<!--    </view>-->
   </view>
 </template>
 
@@ -140,12 +140,12 @@ export default {
   },
   onLoad() {
 
-
-    uni.hideTabBar({
-      animation: false
-    })
+    //
+    // uni.hideTabBar({
+    //   animation: false
+    // })
     let sysInfo = uni.getSystemInfoSync()
-    this.height = sysInfo.screenHeight + 'px'
+    this.height = sysInfo.windowHeight + 'px'
   },
 
   onShow() {

pages/order/index.vue

@@ -149,9 +149,9 @@
 
 
 		<!--		<view class="tabBarLineHeight"></view>-->
-		<view class="tabBarView">
-			<tab-bar :tabIndex="tabBarIndex"></tab-bar>
-		</view>
+<!--		<view class="tabBarView">-->
+<!--			<tab-bar :tabIndex="tabBarIndex"></tab-bar>-->
+<!--		</view>-->
 	</view>
 </template>
 
@@ -195,9 +195,9 @@
 			}
 		},
 		onLoad() {
-			uni.hideTabBar({
-				animation: false
-			})
+			// uni.hideTabBar({
+			// 	animation: false
+			// })
 
 			let sysInfo = uni.getSystemInfoSync()
 			console.log(sysInfo,'2222222222222222222222222')