From 3549664a0f52a6a481282c8ee69f44b213a95e47 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 23 Oct 2024 15:32:58 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesCreateOrder/index/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 1f4eaef..7ca058c 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -158,7 +158,7 @@
 		reactive,
 		ref,
 		nextTick,
-		watch
+		watch,getCurrentInstance
 	} from 'vue';
 	import myCar from './components/car'
 	import go from '@/commons/utils/go.js';
@@ -173,6 +173,7 @@
 		tbShopInfo
 	} from '@/http/yskApi/user.js'
 	import {hasPermission} from '@/commons/utils/hasPermission.js'
+	const instance = getCurrentInstance();
 	let canXiadan=ref(false)
 	async function xiadanClick(){
 		canXiadan.value=await hasPermission('允许下单')

From e0c008732e7919b955918b541ef328cd6a03e84b Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 11:06:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/utils/storageManage.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/commons/utils/storageManage.js b/commons/utils/storageManage.js
index 1f60dcf..1f573e7 100644
--- a/commons/utils/storageManage.js
+++ b/commons/utils/storageManage.js
@@ -126,6 +126,27 @@ const model = {
       return appCache.useType
     }
   },
+  // 缓存代客下单商品
+  cacheGoods: (val, isDelete = false) => {
+    if (isDelete) {
+      appCache.cacheGoods = ""
+      return uni.removeStorageSync('cacheGoods')
+    }
+  
+    if (val) {
+      // 有值，为放置
+      appCache.cacheGoods = val
+      uni.setStorageSync('cacheGoods', val)
+    } else {
+      // 否则为获取
+  
+      if (!appCache.cacheGoods) {
+        //缓存取不到，获取应用本地信息
+        appCache.cacheGoods = uni.getStorageSync('cacheGoods')
+      }
+      return appCache.cacheGoods
+    }
+  },
   // 已经登录的用户记录
   loggedInUser: (addUserName = null, removeUserName = null) => {
     let key = "loggedInUserList"

From 2840bf3b94af9a88728e5e7b02c1f2a5db94dbac Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 11:06:33 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=95=86=E5=93=81=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{goods-item.vue => list-goods-item.vue}    |  4 +++-
 pagesCreateOrder/index/index.vue               | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)
 rename pagesCreateOrder/index/components/{goods-item.vue => list-goods-item.vue} (92%)

diff --git a/pagesCreateOrder/index/components/goods-item.vue b/pagesCreateOrder/index/components/list-goods-item.vue
similarity index 92%
rename from pagesCreateOrder/index/components/goods-item.vue
rename to pagesCreateOrder/index/components/list-goods-item.vue
index f8a7858..418543a 100644
--- a/pagesCreateOrder/index/components/goods-item.vue
+++ b/pagesCreateOrder/index/components/list-goods-item.vue
@@ -1,6 +1,8 @@
 <template>
 	<view class="u-relative u-flex item">
-		<image lazy-load class="img" :src="data.coverImg" mode="aspectFill" :style="computedImgStyle()"></image>
+		
+		<up-image :src="data.coverImg" mode="aspectFill"  :width="img.width" :height="img.height"></up-image>
+		<!-- <image lazy-load class="img" :src="data.coverImg" mode="aspectFill" :style="computedImgStyle()"></image> -->
 		<view class="info u-flex u-row-between u-col-top u-flex-col" @tap="emitEvent('add')">
 			<view>
 				<view>
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 7ca058c..53dc8da 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -76,9 +76,9 @@
 							</view>
 							<view class="item-container">
 								<view class="thumb-box" v-for="(goodsItem, goodsIndex) in item.foods" :key="goodsIndex">
-									<goods-item @chooseGuige="chooseGuige($event,index)"
+									<list-goods-item @chooseGuige="chooseGuige($event,index)"
 										@add="goodsUpdate($event,index,true)" @reduce="goodsUpdate($event,index,false)"
-										:index="goodsIndex" :data="goodsItem"></goods-item>
+										:index="goodsIndex" :data="goodsItem"></list-goods-item>
 
 								</view>
 								<!-- <template v-if="item.name==='附加费'">
@@ -100,11 +100,11 @@
 						<view class="u-font-28 color-666 ">搜索</view>
 						<view class="u-flex u-m-t-20  u-flex-wrap u-row-between">
 							<view class="u-m-b-30" v-for="(goodsItem, goodsIndex) in searchResult" :key="goodsIndex">
-								<goods-item :img="{width:'330rpx',height:'330rpx'}"
+								<list-goods-item :img="{width:'330rpx',height:'330rpx'}"
 									@chooseGuige="chooseGuige(goodsItem.goodsIndex,goodsItem.index)"
 									@add="searchGoodsUpdate(goodsItem,goodsIndex,true)"
 									@reduce="searchGoodsUpdate(goodsItem,goodsIndex,false)" :index="goodsItem.goodsIndex"
-									:data="goodsItem"></goods-item>
+									:data="goodsItem"></list-goods-item>
 
 							</view>
 						</view>
@@ -143,7 +143,7 @@
 	import util from './util.js';
 	import color from '@/commons/color.js';
 	import guigeModel from './components/guige'
-	import goodsItem from './components/goods-item'
+	import listGoodsItem from './components/list-goods-item.vue'
 	import mySurcharge from './components/surcharge'
 	import {
 		onLoad,
@@ -166,6 +166,7 @@
 	import {
 		getNowCart
 	} from '@/pagesCreateOrder/util.js'
+	import storageManage from '@/commons/utils/storageManage.js'
 	import {
 		$returnUseType
 	} from './util.js'
@@ -286,6 +287,7 @@
 			return v.foods.length
 		})
 		data.tabbar = tabbar
+		storageManage.cacheGoods(data.tabbar)
 	}
 
 
@@ -300,7 +302,8 @@
 	//获取商品列表
 	function getGoods(par = {
 		page: 0,
-		size: 300
+		size: 300,
+		showLoading:data.tabbar.length<=0?true:false
 	}) {
 		return Api.getGoodsLists(par)
 	}
@@ -1001,7 +1004,7 @@
 					return;
 				}
 			}
-		}, 10)
+		}, 100)
 	}
 
 	function watchChooseuser() {
@@ -1086,6 +1089,7 @@
 		// 		go.back()
 		// 	}, 1500)
 		// }
+		data.tabbar=storageManage.cacheGoods()
 		init()
 	})
 </script>

From a1770d596a5edbcebfee95938751437bcf9b6780 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 11:07:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9appid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/http.js | 4 ++--
 manifest.json       | 2 +-
 开发文档.md         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 81590ba..3504d16 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -16,10 +16,10 @@ import {
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 // 测试服
-let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
 
 //预发布
-// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
+let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
 
 // 王伟本地测
 // let baseUrl = '/ww'
diff --git a/manifest.json b/manifest.json
index ae45d73..41fb573 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "银收客",
-    "appid" : "__UNI__66E7BD0",
+    "appid" : "__UNI__02A31D8",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : 100,
diff --git a/开发文档.md b/开发文档.md
index e5e608d..bd5d33e 100644
--- a/开发文档.md
+++ b/开发文档.md
@@ -7,7 +7,7 @@
 H5, 不影响。 
 
 ###apk下载地址
-* <https://mp-3b7dba1a-2dfb-4c7a-a239-2ab2157f829a.cdn.bspapp.com/cloudstorage/__UNI__66E7BD0_20241023141536.apk>
+* <https://mp-3b7dba1a-2dfb-4c7a-a239-2ab2157f829a.cdn.bspapp.com/cloudstorage/__UNI__66E7BD0_20241023161228.apk >
 
 ### 全局文件结构
 * commons->utils>hasPermission.js 全局权限验证文件

From c19eb54d6db034441b023f63ca82de4a7c8864fc Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 11:26:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E5=95=86=E5=93=81=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=B8=83=E5=B1=80=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/utils/storageManage.js   | 21 +++++++++++++++++++++
 http/yskApi/Instead.js           |  5 +++--
 http/yskApi/http.js              |  2 +-
 pagesCreateOrder/index/index.vue | 27 +++++++++++++++------------
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/commons/utils/storageManage.js b/commons/utils/storageManage.js
index 1f573e7..27c5fdd 100644
--- a/commons/utils/storageManage.js
+++ b/commons/utils/storageManage.js
@@ -147,6 +147,27 @@ const model = {
       return appCache.cacheGoods
     }
   },
+  // 缓存代客下单商品节点信息缓存
+  cacheGoodsNode: (val, isDelete = false) => {
+    if (isDelete) {
+      appCache.cacheGoodsNode = ""
+      return uni.removeStorageSync('cacheGoodsNode')
+    }
+  
+    if (val) {
+      // 有值，为放置
+      appCache.cacheGoodsNode = val
+      uni.setStorageSync('cacheGoodsNode', val)
+    } else {
+      // 否则为获取
+  
+      if (!appCache.cacheGoodsNode) {
+        //缓存取不到，获取应用本地信息
+        appCache.cacheGoodsNode = uni.getStorageSync('cacheGoodsNode')
+      }
+      return appCache.cacheGoodsNode
+    }
+  },
   // 已经登录的用户记录
   loggedInUser: (addUserName = null, removeUserName = null) => {
     let key = "loggedInUserList"
diff --git a/http/yskApi/Instead.js b/http/yskApi/Instead.js
index 2b6731a..3221307 100644
--- a/http/yskApi/Instead.js
+++ b/http/yskApi/Instead.js
@@ -38,14 +38,15 @@ export function getCart(params) {
  * 已上架商品列表
  * @returns
  */
-export function getGoodsLists(params) {
+export function getGoodsLists(params,showLoading=true) {
   return request({
     url: `/api/place/activate`,
     method: "get",
     params:{
       shopId: uni.getStorageSync("shopId"),
       ...params
-    }
+    },
+	showLoading
   });
 }
 
diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 3504d16..d06ec34 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -183,7 +183,7 @@ function request(args) {
 	} = args
 	let headerObject = {}
 	// headerObject[appConfig.tokenKey] = storageManage.token()
-
+	console.log(showLoading);
 	return commonsProcess(showLoading, () => {
 		return uni.request(
 			Object.assign({
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 53dc8da..4dd08f6 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -198,9 +198,9 @@
 		menuHeight: 0, // 左边菜单的高度
 		menuItemHeight: 0, // 左边菜单item的高度
 		itemId: '', // 栏目右边scroll-view用于滚动的id
-		tabbar: [],
+		tabbar: storageManage.cacheGoods()||[],
 		menuItemPos: [],
-		arr: [],
+		arr: storageManage.cacheGoodsNode()||[],//左右联动布局节点信息
 		scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
 		timer: null, // 定时器
 		topZhanwei: 136 + 24,
@@ -288,6 +288,7 @@
 		})
 		data.tabbar = tabbar
 		storageManage.cacheGoods(data.tabbar)
+		getMenuItemTop()
 	}
 
 
@@ -302,10 +303,10 @@
 	//获取商品列表
 	function getGoods(par = {
 		page: 0,
-		size: 300,
-		showLoading:data.tabbar.length<=0?true:false
+		size: 300
 	}) {
-		return Api.getGoodsLists(par)
+		const showLoading=data.tabbar.length<=0?true:false
+		return Api.getGoodsLists(par,showLoading)
 	}
 	//获取购物车数据
 	async function getCart(par = {
@@ -399,12 +400,14 @@
 
 	//获取桌台信息
 	async function getTableInfo() {
-		const res = await $table.get({
-			qrcode: data.table.tableId
-		})
-		console.log(res);
-		if (res && res.content[0]) {
-			// data.table=res.content[0]
+		if(data.table.tableId){
+			const res = await $table.get({
+				qrcode: data.table.tableId
+			})
+			console.log(res);
+			if (res && res.content[0]) {
+				// data.table=res.content[0]
+			}
 		}
 	}
 	let $originGoods = []
@@ -965,6 +968,7 @@
 				rects.forEach((rect) => {
 					// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
 					data.arr.push(rect.top - rects[0].top);
+					storageManage.cacheGoodsNode(data.arr)
 					resolve();
 				})
 			}).exec()
@@ -1089,7 +1093,6 @@
 		// 		go.back()
 		// 	}, 1500)
 		// }
-		data.tabbar=storageManage.cacheGoods()
 		init()
 	})
 </script>

From a232e77a2d5ebf1c490f9ccefe87ec03ed68352a Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 15:44:45 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E8=83=BD=E5=A4=9F=E8=B4=AD=E4=B9=B0=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageBooking/index/index.vue                   |  12 +-
 pages.json                                    | 415 +-----------------
 pagesCreateOrder/index/components/guige.vue   |  32 +-
 .../index/components/list-goods-item.vue      |   2 +-
 pagesCreateOrder/index/index.vue              |  21 +-
 pagesCreateOrder/index/util.js                |  11 +-
 6 files changed, 57 insertions(+), 436 deletions(-)

diff --git a/pageBooking/index/index.vue b/pageBooking/index/index.vue
index 8183fd0..82c3328 100644
--- a/pageBooking/index/index.vue
+++ b/pageBooking/index/index.vue
@@ -4,17 +4,7 @@
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
+<script setup>
 </script>
 
 <style>
diff --git a/pages.json b/pages.json
index 3e450f3..8b0f807 100644
--- a/pages.json
+++ b/pages.json
@@ -44,58 +44,10 @@
 			}
 		},
 		{
-			"pageId": "PAGES_REGISTER",
-			"path": "pages/login/register",
+			"pageId": "PAGES_ME",
+			"path": "pages/user/user",
 			"style": {
-				"navigationBarTitleText": "注册（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_STATIC_AGREEMENT",
-			"path": "pages/login/serviceAgreement",
-			"style": {
-				"navigationBarTitleText": "服务协议"
-			}
-		},
-		{
-			"pageId": "PAGES_STATIC_POLICY",
-			"path": "pages/login/privacyPolicy",
-			"style": {
-				"navigationBarTitleText": "隐私政策"
-			}
-		},
-		{
-			"pageId": "PAGES_SCAN_LOGIN",
-			"path": "pages/index/scan",
-			"style": {
-				"navigationBarTitleText": "扫码登录中间页（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-
-		{
-			"pageId": "PAGES_PAY_ORDER",
-			"path": "pages/order/order",
-			"style": {
-				"navigationBarTitleText": "订单（自定义导航）",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_PAY_ORDER_DETAIL",
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_REFUND_ORDER",
-			"path": "pages/order/refund",
-			"style": {
-				"navigationBarTitleText": "退款（自定义导航）",
+				"navigationBarTitleText": "我的（自定义导航）",
 				"navigationStyle": "custom"
 			}
 		},
@@ -126,323 +78,6 @@
 			"style": {
 				"navigationBarTitleText": "选择门店"
 			}
-		},
-
-		{
-			"pageId": "PAGES_USER_SETUP",
-			"path": "pages/userSetUp/userSetUp",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"pageId": "PAGES_RESET_PAYPWD",
-			"path": "pages/userSetUp/payPassword",
-			"style": {
-				"navigationBarTitleText": "支付密码"
-			}
-		},
-		{
-			"pageId": "PAGES_RESET_PWD",
-			"path": "pages/userSetUp/accountPwd",
-			"style": {
-				"navigationBarTitleText": "账号密码"
-			}
-		},
-		{
-			"pageId": "PAGES_SYS_CONFIG",
-			"path": "pages/userSetUp/systemSetUp",
-			"style": {
-				"navigationBarTitleText": "系统设置"
-			}
-		},
-		{
-			"pageId": "PAGES_SAFE_CONFIG",
-			"path": "pages/userSetUp/safeSetUp",
-			"style": {
-				"navigationBarTitleText": "安全设置"
-			}
-		},
-		{
-			"pageId": "PAGES_ACCOUNTSETUP",
-			"path": "pages/userSetUp/accountSetUp",
-			"style": {
-				"navigationBarTitleText": "账号设置（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_ME",
-			"path": "pages/user/user",
-			"style": {
-				"navigationBarTitleText": "我的（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_ABOUTMCH",
-			"path": "pages/aboutMch/aboutMch",
-			"style": {
-				"navigationBarTitleText": "关于我们（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_QUICK_PAY",
-			"path": "pages/quickMoney/quickMoney",
-			"style": {
-				"navigationBarTitleText": "快捷收银"
-			}
-		},
-		{
-			"pageId": "PAGES_QR_CASHIER",
-			"path": "pages/quickMoney/qrCashier",
-			"style": {
-				"navigationBarTitleText": "聚合收款码"
-			}
-		},
-		{
-			"pageId": "PAGES_MCH_INFO",
-			"path": "pages/mchInfo/mchInfo",
-			"style": {
-				"navigationBarTitleText": "商户信息"
-			}
-		},
-		{
-			"pageId": "PAGES_NOTICE_USER",
-			"path": "pages/noticeManage/noticeManage",
-			"style": {
-				"navigationBarTitleText": "通知人管理（自定义导航）",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_NOTICE_BING_USER",
-			"path": "pages/noticeManage/bindUser",
-			"style": {
-				"navigationBarTitleText": "通知接收人管理",
-				"navigationBarBackgroundColor": "#fff"
-			}
-		},
-		{
-			"pageId": "PAGES_STAT",
-			"path": "pages/statPage/statPage",
-			"style": {
-				"navigationBarTitleText": "统计报表（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_NOTICE_LIST",
-			"path": "pages/noticePage/noticeList",
-			"style": {
-				"navigationBarTitleText": "全部公告",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_NOTICE_DETAIL",
-			"path": "pages/noticePage/noticeDetail",
-			"style": {
-				"navigationBarTitleText": "公告详情"
-			}
-		},
-		{
-			"pageId": "PAGES_APPLYMENT",
-			"path": "pages/applyment/list",
-			"style": {
-				"navigationBarTitleText": "进件管理",
-				"navigationBarBackgroundColor": "#f7f7f7",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_ADDAPP",
-			"path": "pages/applyment/addApp",
-			"style": {
-				"navigationBarTitleText": "添加应用",
-				"navigationBarBackgroundColor": "#f7f7f7"
-			}
-		},
-		{
-			"pageId": "PAGES_APPLYMENT_BUSINESS",
-			"path": "pages/applyment/business",
-			"style": {
-				"navigationBarTitleText": "商户管理",
-				"navigationBarBackgroundColor": "#f7f7f7",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_APPLYMENT_SELECETDPAY",
-			"path": "pages/applyment/selectedPay",
-			"style": {
-				"navigationBarTitleText": "选择进件渠道",
-				"navigationBarBackgroundColor": "#f7f7f7"
-			}
-		},
-		{
-			"pageId": "PAGES_APPLYMENT_H5_DETAIL",
-			"path": "pages/applyment/h5/applyDetail",
-			"style": {
-				"navigationBarTitleText": "进件详情",
-				"navigationBarBackgroundColor": "#F5F6FC"
-			}
-		},
-		{
-			"pageId": "PAGES_APPLYMENT_H5_OPTION",
-			"path": "pages/applyment/h5/applyOption",
-			"style": {
-				"navigationBarTitleText": "进件配置/签约开通",
-				"navigationBarBackgroundColor": "#F5F6FC"
-			}
-		},
-		{
-			"pageId": "PAGES_FORGET_PASSWORD",
-			"path": "pages/login/forgetPassword",
-			"style": {
-				"navigationBarTitleText": "找回密码"
-			}
-		},
-		{
-			"pageId": "PAGES_SET_NEW_PASSWORD",
-			"path": "pages/login/setNewPassword",
-			"style": {
-				"navigationBarTitleText": "设置新密码"
-			}
-		},
-		{
-			"pageId": "PAGES_EDIT_FORM",
-			"path": "pages/userSetUp/editForm",
-			"style": {
-				"navigationBarTitleText": "修改用户姓名",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"pageId": "PAGES_AD_H5",
-			"path": "pages/adH5/adH5",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_AD_ALIOPERATION",
-			"path": "pages/aliOperation/index",
-			"style": {
-				"navigationBarTitleText": "支付宝代运营授权(自定义)",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_CENTER",
-			"path": "pages/memberCenter/index",
-			"style": {
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER",
-			"path": "pages/memberCenter/member/member",
-			"style": {
-				"navigationBarTitleText": "会员管理（自定义导航）",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_EDIT",
-			"path": "pages/memberCenter/member/edit",
-			"style": {
-				"navigationBarTitleText": "会员编辑（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_DETAIL",
-			"path": "pages/memberCenter/member/detail",
-			"style": {
-				"navigationBarTitleText": "会员详情（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_RECHARGE_RULE",
-			"path": "pages/memberCenter/rechargeRule/index",
-			"style": {
-				"navigationBarTitleText": "充值规则管理（自定义导航）",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_RECHARGE_RULE_EDIT",
-			"path": "pages/memberCenter/rechargeRule/edit",
-			"style": {
-				"navigationBarTitleText": "充值规则编辑（自定义导航）",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_ACCOUNT_HISTORY",
-			"path": "pages/memberCenter/accountHistory/index",
-			"style": {
-				"navigationBarTitleText": "会员账户流水（自定义导航）",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_ACCOUNT_HISTORY_DETAIL",
-			"path": "pages/memberCenter/accountHistory/detail",
-			"style": {
-				"navigationBarTitleText": "流水详情"
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_RECHARGE_RECORD",
-			"path": "pages/memberCenter/rechargeRecord/index",
-			"style": {
-				"navigationBarTitleText": "会员充值记录（自定义导航）",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_RECHARGE_RECORD_DETAIL",
-			"path": "pages/memberCenter/rechargeRecord/detail",
-			"style": {
-				"navigationBarTitleText": "充值记录详情"
-			}
-		},
-		{
-			"pageId": "PAGES_MEMBER_RECHARGE_MEMBERMANUAL",
-			"path": "pages/memberCenter/member/memberManual",
-			"style": {
-				"navigationBarTitleText": "会员调账"
-			}
-		},
-		{
-			"pageId": "PAGES_LIST_SEARCH",
-			"path": "pages/list/search",
-			"style": {
-				"navigationBarTitleText": "搜索"
-			}
-		}, {
-			"path": "pages/release/release",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"pageId": "PAGES_WEBVIEW",
-			"path": "pages/webview/webview"
-		}, {
-			"pageId": "PAGES_INVOICE",
-			"path": "pages/invoice/invoice"
 		}
 	],
 	"subPackages": [{
@@ -1268,19 +903,18 @@
 		{
 			"root": "pageSalesSummary",
 			"pages": [{
-					"pageId": "PAGES_SALES_SUMMARY",
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "销售汇总"
-					}
-				}, {
-					"pageId": "PAGES_PRODUCT_SALES_RANKING",
-					"path": "productSalesRanking",
-					"style": {
-						"navigationBarTitleText": "商品销售排行"
-					}
+				"pageId": "PAGES_SALES_SUMMARY",
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "销售汇总"
 				}
-			]
+			}, {
+				"pageId": "PAGES_PRODUCT_SALES_RANKING",
+				"path": "productSalesRanking",
+				"style": {
+					"navigationBarTitleText": "商品销售排行"
+				}
+			}]
 		},
 		{
 			"root": "pageLineUp",
@@ -1394,10 +1028,8 @@
 				"style": {
 					"navigationBarTitleText": "账单付款记录"
 				}
-			}
-			]
+			}]
 		},
-
 		{
 			"root": "pagePrinter",
 			"pages": [{
@@ -1411,7 +1043,7 @@
 					"pageId": "PAGES_PRINTER_ADD",
 					"path": "add-printer/add-printer",
 					"style": {
-						"navigationBarTitleText" : "添加/编辑云打印机"
+						"navigationBarTitleText": "添加/编辑云打印机"
 						// "navigationBarTitleText": ""
 					}
 				},
@@ -1443,10 +1075,9 @@
 				},
 				{
 					"pageId": "PAGES_GOODS_GROUP_EDIT_GOODS",
-					"path" : "edit-group-goods/edit-group-goods",
-					"style" : 
-					{
-						"navigationBarTitleText" : "管理商品"
+					"path": "edit-group-goods/edit-group-goods",
+					"style": {
+						"navigationBarTitleText": "管理商品"
 					}
 				}
 			]
@@ -1479,14 +1110,6 @@
 				"selectedIconPath": "static/tabImg/index-select.png",
 				"text": "首页"
 			}
-			// ,
-			// {
-			// 	"pagePath": "pages/order/order",
-			// 	"iconPath": "static/tabImg/order.png",
-			// 	"selectedIconPath": "static/tabImg/order-select.png",
-			// 	"text": "订单"
-			// }
-			,
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tabImg/user.png",
diff --git a/pagesCreateOrder/index/components/guige.vue b/pagesCreateOrder/index/components/guige.vue
index 27df7d0..38551b4 100644
--- a/pagesCreateOrder/index/components/guige.vue
+++ b/pagesCreateOrder/index/components/guige.vue
@@ -111,21 +111,17 @@
 		console.log(props.goodsData.isStock);
 		number.value = newval.suit || 1
 	})
-	
-	
-	const isCanBuy=computed(()=>{
-		if(!goods.value) {
+
+
+	const isCanBuy = computed(() => {
+		if (!goods.value) {
 			return false
 		}
-		console.log(util.isCanBuy({
-			...goods.value,
-			isStock: props.goodsData.isStock
-		}));
-		return util.isCanBuy({
-			...goods.value,
-			isStock: props.goodsData.isStock
-		})
-		
+		return util.isCanBuy(
+			goods.value,
+			props.goodsData
+		)
+
 	})
 
 	//全部规格是否都无法使用
@@ -169,11 +165,11 @@
 	function close() {
 		model.value.close()
 	}
-	
-	const isDisabled=computed(()=>{
-		return isAllDisabled.value || !isCanBuy.value 
+
+	const isDisabled = computed(() => {
+		return isAllDisabled.value || !isCanBuy.value
 	})
-	
+
 	function reduce() {
 		if (isDisabled.value) {
 			return
@@ -194,7 +190,7 @@
 		number.value = newval
 	}
 
-	
+
 
 	function confirm() {
 		close()
diff --git a/pagesCreateOrder/index/components/list-goods-item.vue b/pagesCreateOrder/index/components/list-goods-item.vue
index 418543a..eadb427 100644
--- a/pagesCreateOrder/index/components/list-goods-item.vue
+++ b/pagesCreateOrder/index/components/list-goods-item.vue
@@ -135,7 +135,7 @@
 	.btn-hover-class {
 		opacity: .6;
 	}
-
+	image{will-change: transform}
 	.item {
 		// width: 250rpx;
 		// height: 272rpx;
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 4dd08f6..81897ff 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -440,6 +440,10 @@
 		$originGoods = goods
 		if (!data.table.tableId) {
 			//无桌台
+			const {
+				masterId
+			} = await getMasterId()
+			data.masterId = masterId
 			setTabBar(category, goods, [])
 			return
 		}
@@ -587,7 +591,7 @@
 			return prve;
 		}, {});
 		const canBudyGoods = specList
-			.filter((v) => util.isCanBuy(v))
+			.filter((v) => util.isCanBuy(v,guigeModelData.chooseGoods.item))
 			.sort((a, b) => {
 				const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
 					return prve + skuMapNumber[cur];
@@ -676,7 +680,7 @@
 					prve[i] = matchArr
 						.filter((v) => v.specSnap.match(i))
 						.every((v) => {
-							return !util.isCanBuy(v)
+							return !util.isCanBuy(v,guigeModelData.chooseGoods.item)
 						});
 				}
 			}
@@ -801,7 +805,8 @@
 	}
 
 	function canAddGoods() {
-		return data.table.tableId
+		// return data.table.tableId
+		return true
 	}
 
 	function searchGoodsUpdate(goodsItem,goodsIndex, isAdd) {
@@ -813,11 +818,11 @@
 		}
 	}
 	async function goodsUpdate(foodsindex, index, isAdd,searchGoodsIndex) {
-		if (!canAddGoods()) {
-			return infoBox.showToast('请先选择桌台', 0.5).then(res => {
-				chooseTable()
-			})
-		}
+		// if (!canAddGoods()) {
+		// 	return infoBox.showToast('请先选择桌台', 0.5).then(res => {
+		// 		chooseTable()
+		// 	})
+		// }
 		const $goods = data.tabbar[index].foods[foodsindex]
 		if ($goods.isDan) {
 			//单规格
diff --git a/pagesCreateOrder/index/util.js b/pagesCreateOrder/index/util.js
index a76add4..4f54608 100644
--- a/pagesCreateOrder/index/util.js
+++ b/pagesCreateOrder/index/util.js
@@ -18,8 +18,15 @@ export function $returnUseType(shop, useType) {
 	return result
 }
 //判断商品是否可以下单
-export function isCanBuy(goods, isStock) {
-	return goods.isGrounding && goods.isPauseSale == 0 && (isStock ? goods.stockNumber > 0 : true);
+export function isCanBuy(skuGoods,goods) {
+    if(goods.typeEnum=='normal'){
+        //单规格
+        return goods.isGrounding&&goods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+    }else{
+        //多规格
+        return  goods.isGrounding&&goods.isPauseSale==0&&skuGoods.isGrounding&&skuGoods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+
+    }
 }