叫号功能

common/js/service.js

@@ -123,6 +123,15 @@ export default {
             data:param
         })
     },
+    // 叫号
+    call(param) {
+        return request({
+            url: '/business/tech/call',
+            method: 'GET',
+            data:param
+        })
+    },
+
 
 
 

manifest.json

@@ -1,88 +1,88 @@
 {
-	"name": "娇骄儿技师端",
-	"appid": "__UNI__5ADCEDA",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2",
-	"h5": {
-		"router": {
-			"mode": "hash",
-			"base": "./"
-		},
-		"devServer": {
-			"https": false
-		},
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "ZIABZ-543WB-747UM-JL5Y7-NDS4E-HWB4M"
-				}
-			}
-		}
-	}
-}
+    "name" : "娇骄儿技师端",
+    "appid" : "__UNI__5ADCEDA",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "devServer" : {
+            "https" : false
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "ZIABZ-543WB-747UM-JL5Y7-NDS4E-HWB4M"
+                }
+            }
+        }
+    }
+}

pages/index/index.vue

@@ -47,8 +47,7 @@
 					</view>
 				</view>
 				<view :style="{'height':'110rpx'}"></view>
-				<view class="flex-row justify-center " v-if="currService.balanceFlag">
-
+				<view class="flex-row justify-center " v-if="!currService.balanceFlag">
 					<view class="flex-row hintView">
 						<view class="hint">
 							<text>!</text>
@@ -108,7 +107,7 @@
 									<text class="value1">￥{{currService.serviceFee}}</text>
 								</view>
 							</view>
-							<view class="flex-row justify-center tag1" v-if="currService.isSettle == 0" @click="settle">
+							<view class="flex-row justify-center tag1" v-if="currService.status == 1" @click="settle">
 								<u-icon name="/static/index/qianbao.png" size="18"></u-icon>
 								<text>去结算</text>
 							</view>
@@ -119,20 +118,44 @@
 				<view class="flex-row justify-center">
 					<view class="flex-row justify-around grid">
 						<view @click="connect">
-							<u-icon name="/static/index/jiaojieban.png" size="40"></u-icon>
-							<text class="grid-text">服务交接</text>
+							<view class="flex-row justify-center">
+								<u-icon name="/static/index/jiaojieban.png" size="40"></u-icon>
+							</view>
+							<view class="flex-row justify-center">
+								<text class="grid-text">服务交接</text>
+							</view>
 						</view>
 						<view @click="addService">
-							<u-icon name="/static/index/jiandao.png" size="40"></u-icon>
-							<text class="grid-text">添加服务</text>
+							<view class="flex-row justify-center">
+								<u-icon name="/static/index/jiandao.png" size="40"></u-icon>
+							</view>
+							<view class="flex-row justify-center">
+								<text class="grid-text">添加服务</text>
+							</view>
 						</view>
-						<view @click="next">
-							<u-icon name="/static/index/xiayige.png" size="40"></u-icon>
-							<text class="grid-text">下一位</text>
+						<view @click="call" v-if="currService.State=='2'">
+							<view class="flex-row justify-center">
+								<u-icon name="/static/index/naba.png" size="40"></u-icon>
+							</view>
+							<view class="flex-row justify-center">
+								<text class="grid-text">叫&nbsp;&nbsp;号</text>
+							</view>
+						</view>
+						<view @click="next" v-else>
+							<view class="flex-row justify-center">
+								<u-icon name="/static/index/xiayige.png" size="40"></u-icon>
+							</view>
+							<view class="flex-row justify-center">
+								<text class="grid-text">下一位</text>
+							</view>
 						</view>
 						<view @click="takePlace">
-							<u-icon name="/static/index/yijiuwei.png" size="40"></u-icon>
-							<text class="grid-text">已就位</text>
+							<view class="flex-row justify-center">
+								<u-icon name="/static/index/yijiuwei.png" size="40"></u-icon>
+							</view>
+							<view class="flex-row justify-center">
+								<text class="grid-text">已就位</text>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -287,10 +310,10 @@
 			this.sysHeight = sysInfo.windowHeight - (sysInfo.windowWidth / 750) * 400 + 'px'
 			this.readerHeight = sysInfo.windowHeight + 'px'
 			this.readerWidth = sysInfo.windowWidth + 'px'
-			this.storeId = uni.getStorageSync('storeId')
-			this.storeName = uni.getStorageSync('storeName')
+			// this.storeId = uni.getStorageSync('storeId')
+			// this.storeName = uni.getStorageSync('storeName')
 			this.getUserInfo()
-			// this.currServiceInfo()
+			this.currServiceInfo()
 
 
 		},
@@ -433,6 +456,13 @@
 					this.currServiceInfo()
 				})
 			},
+			call(){
+				this.$api.service.call({
+					orderServiceId: this.currService.orderServiceId
+				}).then(res => {
+					this.currServiceInfo()
+				})
+			},
 
 			next() {
 				this.$api.service.next({