Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

http/yskApi/http.js

@@ -15,6 +15,7 @@ import {
 } from '@/commons/utils/encryptUtil.js'
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
+import { reject } from 'lodash';
 // 测试服
 let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
@@ -127,8 +128,9 @@ function commonsProcess(showLoading, httpReqCallback) {
 	}).catch(res => {
 		if(res.status==401){
 			storageManage.token(null, true)
-			infoBox.showErrorToast('请登录').then(() => {
-				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			infoBox.showErrorToast(res.message||'请登录').then(() => {
+				uni.redirectTo({url: '/pages/login/index'})
+				reject()
 			})
 		}
 		// if(res.status==400){
@@ -138,9 +140,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 		// 	})
 		// }
 		if(res.status==500){
-			storageManage.token(null, true)
-			infoBox.showErrorToast('请登录').then(() => {
-				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			infoBox.showErrorToast(res.message||'服务器异常').then(() => {
 			})
 		}
 		// if(res&&res.msg){

http/yskApi/table.js

@@ -1,6 +1,6 @@
 // 桌台管理
 import http from './http.js'
-const request=http.request
+const request = http.request
 import $API from '@/http/classApi.js'
 import appConfig from '@/config/appConfig.js'
 import {
@@ -9,9 +9,9 @@ import {
 import infoBox from '@/commons/utils/infoBox.js'
 
 /* 台桌区域 */
-export const $tableArea=new $API('/api/tbShopArea',http.req)
+export const $tableArea = new $API('/api/tbShopArea', http.req)
 /* 台桌 */
-export const $table=new $API('/api/tbShopTable',http.req)
+export const $table = new $API('/api/tbShopTable', http.req)
 /* 绑定 */
 // export const $bind=new $API('/api/tbShopTable/bind',http.req)
 export function $bind(data) {
@@ -23,4 +23,28 @@ export function $bind(data) {
 			...data
 		}
 	});
+}
+//获取台桌详情状态
+export function $returnTableDetail(data) {
+	return request({
+		url: '/api/tbShopTable/state',
+		method: "get",
+		params: {
+			shopId: uni.getStorageSync('shopId'),
+			...data
+		}
+	});
+}
+
+
+// 选择台桌
+export function $choseTable(data) {
+	return request({
+		url: '/api/place/choseTable',
+		method: "put",
+		data: {
+			shopId: uni.getStorageSync('shopId'),
+			...data
+		}
+	});
 }