From a40e286db19223c335d8af9f80aa92b578f0f7ba Mon Sep 17 00:00:00 2001
From: yangsai <yangsai@163.com>
Date: Wed, 30 Oct 2024 15:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods_cate/template/template3.vue |  2 +-
 pages/goods_details/index.vue           |  9 ++++--
 pages/index/index.vue                   |  6 ++--
 pages/store/table_code/cart.vue         | 39 ++++++++++++++++---------
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/pages/goods_cate/template/template3.vue b/pages/goods_cate/template/template3.vue
index 7619128..fbc357c 100644
--- a/pages/goods_cate/template/template3.vue
+++ b/pages/goods_cate/template/template3.vue
@@ -10,7 +10,7 @@
 						<view class="w-full h-58 flex-y-center rd-30rpx bg--w111-f5f5f5 px-32" @tap="goSearch">
 						<!-- #endif -->
 							<text class="iconfont icon-ic_search fs-28"></text>
-							<text class="fs-24 pl-18">请输入商品名称3</text>
+							<text class="fs-24 pl-18">请输入商品名称</text>
 						</view>
 						<!-- 胶囊占据的位置 -->
 						<!-- #ifdef MP -->
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index baed341..85e67ee 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -958,7 +958,10 @@
 		onShareAppMessage: function() {
 			let that = this;
 			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			userShare();
+			if (this.isLogin) {
+				userShare();
+			}
+			
 			return {
 				title: that.storeInfo.store_name || '',
 				imageUrl: that.storeInfo.image || '',
@@ -968,7 +971,9 @@
 		onShareTimeline() {
 			let that = this;
 			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			userShare();
+			if (this.isLogin) {
+				userShare();
+			}
 			return {
 				title: that.storeInfo.store_name || '',
 				imageUrl: that.storeInfo.image || '',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1b4d1c2..cf82034 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,9 +5,7 @@
 		<view class="xuanzmd">
 			<text @click="xuzemd">{{mrmd}}</text>
 			<uni-icons type="right" size="16" color="white"></uni-icons>
-			<text class="sytitle" >首页</text>
-			<text class="sytitle" @click="goUrl(1)">座位预定</text>
-			<text class="sytitle" @click="goUrl(2)">存取酒</text>
+			<text class="sytitle" @click="saoma">首页</text>
 		</view>
 		<!-- <view class="input-container">
 			<input class="inputserch"  placeholder="搜索喜欢的商品" prefixIcon="search"  v-model="searchValue"/>
@@ -506,7 +504,7 @@
 		methods: {
 			saoma(){
 				uni.navigateTo({
-					url:'/pages/store/table_code/index?store_id=1&qrcode_id=14', 
+					url:'/pages/store/table_code/index?store_id=1&qrcode_id=115', 
 				})
 			},
 			onInput(e){
diff --git a/pages/store/table_code/cart.vue b/pages/store/table_code/cart.vue
index 40356d0..8ceeebb 100644
--- a/pages/store/table_code/cart.vue
+++ b/pages/store/table_code/cart.vue
@@ -413,21 +413,30 @@
 			},
 			// 生成订单；
 			subOrder: function() {
+				this.getCartList(1);
 				if(!uni.getStorageSync('pay_vip_status')){
 					this.$refs.popup.open('center')
 				}else{
-				placeOrder({
-					tableId: this.info.tableId,
-					storeId: this.info.store_id,
-				}).then(() => {
-					uni.navigateTo({
-						url: `/pages/store/table_confirm/index?tableId=${this.info.tableId}&store_number_diners_window=${this.info.store_number_diners_window}`
-					});
-				}).catch(err => {
-					this.$util.Tips({
-						title: err
+					uni.showModal({
+						title: '确定下单吗？',
+						content: '下单后购物车商品将不能操作',
+						success: (res) => {
+							if (res.confirm) {
+								placeOrder({
+									tableId: this.info.tableId,
+									storeId: this.info.store_id,
+								}).then(() => {
+									uni.navigateTo({
+										url: `/pages/store/table_confirm/index?tableId=${this.info.tableId}&store_number_diners_window=${this.info.store_number_diners_window}`
+									});
+								}).catch(err => {
+									this.$util.Tips({
+										title: err
+									});
+								});
+							}
+						}
 					});
-				});
 				}
 			},
 			// 计算总价；
@@ -494,9 +503,10 @@
 			getCartLists() {
 				console.log('this.footerOpen',this.footerOpen);
 				if (this.footerOpen) {
-					this.getCartList();
+					this.getCartList(1);
 				} else {
 					this.footerOpen = true;
+					this.getCartList(1);
 				}
 			},
 			getCartList(iSshow) {
@@ -511,7 +521,8 @@
 				}).then(res => {
 					that.$set(that.cartData, 'cartList', res.data);
 					if (res.data.length) {
-						that.$set(that.cartData, 'iScart', iSshow ? false : !that.cartData.iScart);
+						that.$set(that.cartData, 'iScart', iSshow);
+						that.footerOpen = true;
 					} else {
 						that.$set(that.cartData, 'iScart', false);
 					}
@@ -818,7 +829,7 @@
 					}
 					that.getCartNum();
 					if (!cart) {
-						that.getCartList(1);
+						that.getCartList();
 					}
 				}).catch(err => {
 					that.$util.Tips({