From e4dce854b6ca85e7914ff277624386325c720a02 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 21 Oct 2024 17:33:36 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E5=A4=9F=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

---
 pagesOrder/pay-order/pay-order.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 6acb4e9..0ed8f1b 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -177,8 +177,8 @@
 	 function setUser(par) {
 		console.log(option);
 		const submitPar = {
-			masterId: option.masterId,
-			tableId: option.tableId,
+			tableId: order.tableId,
+			masterId: order.masterId,
 			vipUserId: user.value.id ? user.value.id : '',
 			type: user.value.id ? 0 : 1 //0 设置 1 取消
 		}

From 4e68a0cda3ea21ad9381190e78de11896deef3f9 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 21 Oct 2024 17:34:39 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index d820985..2673ea5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -119,11 +119,11 @@
 			icon: '/static/indexImg/icon-work.svg',
 			pageUrl: 'PAGES_WORK_INDEX',
 		},
-		{
-			title: '极速开票',
-			icon: '/static/indexImg/red-envelope.svg',
-			pageUrl: 'PAGES_INVOICE'
-		},
+		// {
+		// 	title: '极速开票',
+		// 	icon: '/static/indexImg/red-envelope.svg',
+		// 	pageUrl: 'PAGES_INVOICE'
+		// },
 		{
 			title: '排队',
 			icon: '/static/indexImg/icon-line-up.svg',

From 555570501c0342e47dcd2decfc5d081b99c29214 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 09:51:21 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=88=86=E7=B1=BB=E6=A0=B7=E5=BC=8F=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=9C=80=E5=A4=A7=E4=B8=89=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index b4f706c..a4c3aac 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -52,7 +52,7 @@
 					:scroll-top="data.scrollTop" :scroll-into-view="data.itemId">
 					<view v-for="(item,index) in data.tabbar" :key="index" class="u-tab-item"
 						:class="[data.current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
-						<text class="u-line-1">{{item.name}}</text>
+						<text class="u-line-3">{{item.name}}</text>
 					</view>
 				</scroll-view>
 				<scroll-view :scroll-top="data.scrollRightTop" scroll-y scroll-with-animation class="right-box"
@@ -1171,6 +1171,8 @@
 		color: #444;
 		font-weight: 400;
 		line-height: 1;
+		box-sizing: border-box;
+		padding-left: 12rpx;
 	}
 
 	.u-tab-item-active {

From f829c2da841db787368f209daaa0376aaf15a770 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:15:50 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D=E5=94=AE=E7=BD=84=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=85=B3=E9=97=AD=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageProduct/index/components/goods.vue | 7 +++----
 pageProduct/index/index.vue            | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue
index 0598bfd..7eb9cf3 100644
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -52,7 +52,9 @@
 								@click="guigeClick(index)">
 								<text>{{item.specSnap||item.name}}</text>
 								<view class="tag-primary tag" v-if="item.isGrounding">上架中</view>
-								<view class="tag-gray tag" v-else>已下架</view>
+								<view class="tag-gray tag" v-if="item.isPauseSale">已售罄</view>
+								<view class="tag-gray tag" v-if="!item.isGrounding">已下架</view>
+								
 								<!-- <template v-if="item.isPauseSale">
 									<view class="tag-gray tag" >已售罄</view>
 								</template>
@@ -113,9 +115,6 @@
 			</view>
 		</view>
 
-
-
-
 	</view>
 </template>
 
diff --git a/pageProduct/index/index.vue b/pageProduct/index/index.vue
index 4ab5da9..d0a60e3 100644
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -131,7 +131,7 @@
 		<edit-stock :category="pageData.categoryList" v-model:show="popup.stock.show" @save="changeStockConfirm"
 			:goods="pageData.selGoods"></edit-stock>
 		<!-- 规格弹窗 -->
-		<edit-guige @isGroundingChange="isGroundingChange" v-model:show="popup.guige.show"
+		<edit-guige @isGroundingChange="isGroundingChange" v-model:show="popup.guige.show" @isPauseSaleChange="isPauseSaleChange"
 			:goods="popup.guige.data"></edit-guige>
 		<!-- 报损 -->
 		<baosun-vue :category="pageData.categoryList" v-model:show="popup.baosun.show"

From 40e9f10bccdaeb169cb5deefc877c73eb2468709 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:21:35 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageCategory/edit-category/edit-category.vue | 79 ++++++++++++++------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/pageCategory/edit-category/edit-category.vue b/pageCategory/edit-category/edit-category.vue
index 4358d90..13686b4 100644
--- a/pageCategory/edit-category/edit-category.vue
+++ b/pageCategory/edit-category/edit-category.vue
@@ -207,14 +207,15 @@
 						</view>
 						<view class="">
 							<uni-forms-item label="分类名称" required name="name">
-								<uni-easyinput padding-none :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-									v-model="categoryChild.name" placeholder="输入分类名称" />
+								<uni-easyinput padding-none :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="categoryChild.name" placeholder="输入分类名称" />
 							</uni-forms-item>
 						</view>
 						<template v-if="option.type==='edit'">
 							<uni-forms-item label="排序" required name="sort">
-								<uni-easyinput padding-none :placeholderStyle="placeholderStyle" :inputBorder="inputBorder"
-									v-model="categoryChild.sort" type="number" placeholder="排序越小越靠前" />
+								<uni-easyinput padding-none :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="categoryChild.sort" type="number"
+									placeholder="排序越小越靠前" />
 							</uni-forms-item>
 						</template>
 						<uni-forms-item label="">
@@ -241,9 +242,11 @@
 				</view>
 			</template>
 		</my-model>
+
+		<up-modal title="提示" content="确认删除该分类吗?" :show="modal.del" showCancelButton closeOnClickOverlay
+			@confirm="confirmModelConfirm" @cancel="setModalShow('del',false)" @close="setModalShow('del',false)"
+			width="300px"></up-modal>
 	</view>
-
-
 </template>
 
 <script setup>
@@ -269,7 +272,28 @@
 		onBeforeMount,
 		watch
 	} from 'vue';
+	const modal = reactive({
+		key: '',
+		del: false
+	})
 
+	function confirmModelConfirm() {
+		if (modal.key == 'del') {
+			 $productCategory.del([selItem.data.id]).then(res => {
+				category.childrenList.splice(selItem.index, 1)
+				infoBox.showToast('删除成功')
+				uni.setStorageSync('cateItem', category)
+			})
+			modal.del=false
+			return
+		}
+	}
+
+	function setModalShow(key = 'show', show = true) {
+		modal.key = key
+		modal[key] = show
+		console.log(modal);
+	}
 
 	const refAddChilCate = ref(null)
 	const refAddChilCateTitle = ref('添加子分类')
@@ -339,19 +363,21 @@
 			return
 		}
 		if (index === 1) {
-			return uni.showModal({
-				title: '提示',
-				content: '确认删除该分类吗?',
-				success(res) {
-					if (res.confirm) {
-						$productCategory.del([selItem.data.id]).then(res => {
-							category.childrenList.splice(selItem.index, 1)
-							infoBox.showToast('删除成功')
-							uni.setStorageSync('cateItem', category)
-						})
-					}
-				}
-			})
+			setModalShow('del', true)
+			return
+			// return uni.showModal({
+			// 	title: '提示',
+			// 	content: '确认删除该分类吗?',
+			// 	success(res) {
+			// 		if (res.confirm) {
+			// 			$productCategory.del([selItem.data.id]).then(res => {
+			// 				category.childrenList.splice(selItem.index, 1)
+			// 				infoBox.showToast('删除成功')
+			// 				uni.setStorageSync('cateItem', category)
+			// 			})
+			// 		}
+			// 	}
+			// })
 		}
 	}
 
@@ -676,13 +702,16 @@
 	$icon-line-width: 20rpx;
 	$icon-line-height: 4rpx;
 	@import '@/commons/style/reset-uni-form.scss';
-	::v-deep .uni-forms-item--border{
-		padding-top: 24rpx ;
-		padding-bottom: 24rpx ;
+
+	::v-deep .uni-forms-item--border {
+		padding-top: 24rpx;
+		padding-bottom: 24rpx;
 	}
-	::v-deep .uni-forms-item.is-direction-top .uni-forms-item__label{
+
+	::v-deep .uni-forms-item.is-direction-top .uni-forms-item__label {
 		padding-bottom: 16rpx;
 	}
+
 	.category-icon {
 		width: 60rpx;
 		height: 60rpx;
@@ -697,9 +726,11 @@
 	.my-switch {
 		transform: scale(0.7);
 	}
-	::v-deep .uni-forms-item__content{
+
+	::v-deep .uni-forms-item__content {
 		min-height: inherit;
 	}
+
 	::v-deep .uni-forms-item__error {
 		display: none !important;
 	}

From a183514533aa35bc4bc02c8509197cd1c9e45f97 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:24:24 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesCreateOrder/index/components/car.vue     | 190 +++++++++++-------
 .../index/components/goods-item.vue           |   6 +-
 2 files changed, 117 insertions(+), 79 deletions(-)

diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue
index 89af4f5..9547612 100644
--- a/pagesCreateOrder/index/components/car.vue
+++ b/pagesCreateOrder/index/components/car.vue
@@ -1,74 +1,83 @@
 <template>
-	<view class="mask" @tap="hideGoods" v-if="switchGoods"></view>
-	<view class="car border-top u-flex u-row-between u-col-bottom u-relative">
-		<view class="u-absolute goods bg-fff">
-			<view
-				class="u-p-t-32 color-666 border-bottom bg-fff u-absolute total u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
-				<view>已添加{{goodsNumber}}件商品</view>
-				<view class="color-666">
-					<uni-icons color="#666" type="trash"></uni-icons>
-					<text class="u-m-l-10" @tap="clear">清空</text>
-				</view>
-			</view>
-			<scroll-view scroll-y="true" class="tranistion" :style="{height:switchGoods?'50vh':0 }">
-				<!-- 占位 -->
-				<view class="u-p-t-32 color-666 border-bottom u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between"
-					style="opacity: 0;">
+	<view>
+
+		<view class="mask" @tap="hideGoods" v-if="switchGoods"></view>
+		<view class="car border-top u-flex u-row-between u-col-bottom u-relative">
+			<view class="u-absolute goods bg-fff">
+				<view
+					class="u-p-t-32 color-666 border-bottom bg-fff u-absolute total u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
 					<view>已添加{{goodsNumber}}件商品</view>
 					<view class="color-666">
 						<uni-icons color="#666" type="trash"></uni-icons>
-						<text class="u-m-l-10">清空</text>
+						<text class="u-m-l-10" @tap="setModalShow('clear',true)">清空</text>
 					</view>
 				</view>
-				<!-- 占位 -->
-				<view class="color-333 item border-top u-flex u-row-center u-row-between" v-for="(item,index) in data"
-					:key="index">
-					<view class="">
-						<view>{{item.name}}</view>
-						<view class="u-m-t-10 u-font-24 color-666">{{item.specSnap||''}}</view>
+				<scroll-view scroll-y="true" class="tranistion" :style="{height:switchGoods?'50vh':0 }">
+					<!-- 占位 -->
+					<view class="u-p-t-32 color-666 border-bottom u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between"
+						style="opacity: 0;">
+						<view>已添加{{goodsNumber}}件商品</view>
+						<view class="color-666">
+							<uni-icons color="#666" type="trash"></uni-icons>
+							<text class="u-m-l-10">清空</text>
+						</view>
 					</view>
-					<view class="u-flex">
-						<view class="font-bold red u-m-r-32">￥{{formatPrice(item.salePrice*item.number) }}</view>
-						<view class="u-flex" @tap="updateNumber(false,index,item)">
-							<image src="/pagesCreateOrder/static/images/icon-reduce-black.svg" class="icon" mode="">
-							</image>
-						</view>
-						<view class="u-m-l-30 u-m-r-30 color-333">
-							{{item.number}}
-						</view>
-						<view class="u-flex" @tap="updateNumber(true,index,item)">
-							<image src="/pagesCreateOrder/static/images/icon-add-black.svg" class="icon" mode="">
-							</image>
+					<!-- 占位 -->
+					<view class="color-333 item border-top u-flex u-row-center u-row-between"
+						v-for="(item,index) in data" :key="index">
+						<view class="">
+							<view class="u-line-1">{{item.name}}</view>
+							<view class="u-m-t-10 u-font-24 color-666 u-line-1">{{item.specSnap||''}}</view>
 						</view>
+						<view class="u-flex">
+							<view class="font-bold red u-m-r-32">￥{{formatPrice(item.salePrice*item.number) }}</view>
+							<view class="u-flex" @tap="updateNumber(false,index,item)">
+								<image src="/pagesCreateOrder/static/images/icon-reduce-black.svg" class="icon" mode="">
+								</image>
+							</view>
+							<view class="u-m-l-30 u-m-r-30 color-333">
+								{{item.number}}
+							</view>
+							<view class="u-flex" @tap="updateNumber(true,index,item)">
+								<image src="/pagesCreateOrder/static/images/icon-add-black.svg" class="icon" mode="">
+								</image>
+							</view>
 
+						</view>
 					</view>
-				</view>
-				<my-empty v-if="!data.length" text="暂未有添加商品"></my-empty>
-			</scroll-view>
+					<my-empty v-if="!data.length" text="暂未有添加商品"></my-empty>
+				</scroll-view>
+
+			</view>
+			<view class="icon-car-box" @tap="toggleGoods">
+				<image src="/pagesCreateOrder/static/images/icon-car.svg" class="icon-car" />
+				<view class="dot">{{goodsNumber}}</view>
+			</view>
+			<view class="price font-bold u-flex">
+				<view>￥</view>
+				<view>{{allPrice}}</view>
+			</view>
+			<my-button shape="circle" height="80" width="220" @tap="toConfimOrder">
+				<text class="u-font-32 font-bold">{{table.type=='add'?'确认加菜':'去下单'}} </text>
+			</my-button>
+
 
 		</view>
-		<view class="icon-car-box" @tap="toggleGoods">
-			<image src="/pagesCreateOrder/static/images/icon-car.svg" class="icon-car" />
-			<view class="dot">{{goodsNumber}}</view>
-		</view>
-		<view class="price font-bold u-flex">
-			<view>￥</view>
-			<view>{{allPrice}}</view>
-		</view>
-		<my-button shape="circle" height="80" width="220" @tap="toConfimOrder">
-			<text class="u-font-32 font-bold">{{table.type=='add'?'确认加菜':'去下单'}} </text>
-		</my-button>
-
+		<up-modal title="提示" content="是否清空全部已添加的商品?" :show="modal.clear" showCancelButton closeOnClickOverlay @confirm="confirmModelConfirm"
+			@cancel="setModalShow('clear',false)" @close="setModalShow('clear',false)" width="300px"></up-modal>
 	</view>
 </template>
 
 <script setup>
 	import go from '@/commons/utils/go.js';
 	import infoBox from '@/commons/utils/infoBox.js';
-	import {formatPrice} from '@/commons/utils/format.js';
-	
+	import {
+		formatPrice
+	} from '@/commons/utils/format.js';
+
 	import {
 		computed,
+		reactive,
 		ref
 	} from 'vue';
 	const props = defineProps({
@@ -78,10 +87,11 @@
 				return []
 			}
 		},
-		isCreateOrderToDetail:{
-			type:Boolean,default:false
+		isCreateOrderToDetail: {
+			type: Boolean,
+			default: false
 		},
-		user:{
+		user: {
 			type: Object,
 			default: () => {
 				return {
@@ -89,20 +99,41 @@
 				}
 			}
 		},
-		table:{
+		table: {
 			type: Object,
 			default: () => {
 				return {
-					tableId:''
+					tableId: ''
 				}
 			}
 		},
-		masterId:{
-			type: [String,Number],
-			default:''
+		masterId: {
+			type: [String, Number],
+			default: ''
 		}
 	})
+	const modal = reactive({
+		key: '',
+		clear:false
+	})
+
+	function confirmModelConfirm() {
+		if (modal.key == 'clear') {
+			clear()
+		}
+	}
+
+	function setModalShow(key = 'show', show = true) {
+		if (key == 'clear'&&show&&props.data.length<=0) {
+			return infoBox.showToast('购物车是空的！')
+		}
+		modal.key = key
+		modal[key] = show
+		console.log(modal);
+	}
+
 	
+
 	const edmits = defineEmits(['clear', 'updateNumber'])
 
 	// mask
@@ -122,20 +153,31 @@
 
 	function toConfimOrder() {
 		console.log(props.user);
-		if(props.data.length<=0){
+		if (props.data.length <= 0) {
 			return infoBox.showToast('还没有选择商品')
 		}
-		const {tableId,name,maxCapacity,status,type}=props.table
-		go.to('PAGES_CONFIRM_ORDER',{
-			masterId:props.masterId,type,
-			tableId,name,maxCapacity,status,isCreateOrderToDetail:props.isCreateOrderToDetail?1:0
+		const {
+			tableId,
+			name,
+			maxCapacity,
+			status,
+			type
+		} = props.table
+		go.to('PAGES_CONFIRM_ORDER', {
+			masterId: props.masterId,
+			type,
+			tableId,
+			name,
+			maxCapacity,
+			status,
+			isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0
 		})
 	}
 
 	const allPrice = computed(() => {
-		return props.data.reduce((prve,cur)=>{
-			return prve+cur.salePrice*cur.number
-		},0).toFixed(2)
+		return props.data.reduce((prve, cur) => {
+			return prve + cur.salePrice * cur.number
+		}, 0).toFixed(2)
 	})
 
 	const goodsNumber = computed(() => {
@@ -158,16 +200,9 @@
 	}
 
 	function clear() {
-		uni.showModal({
-			title: '提示',
-			content: '是否清空全部已添加的商品?',
-			success(res) {
-				if (res.confirm) {
-					edmits('clear')
-					hideGoods()
-				}
-			}
-		})
+		setModalShow('clear',false)
+		edmits('clear')
+		hideGoods()
 	}
 
 	import myButton from '@/components/my-components/my-button.vue'
@@ -249,6 +284,7 @@
 			justify-content: center;
 			align-items: center;
 			z-index: 2;
+
 			.dot {
 				position: absolute;
 				right: 0;
diff --git a/pagesCreateOrder/index/components/goods-item.vue b/pagesCreateOrder/index/components/goods-item.vue
index 186907a..f8a7858 100644
--- a/pagesCreateOrder/index/components/goods-item.vue
+++ b/pagesCreateOrder/index/components/goods-item.vue
@@ -1,9 +1,11 @@
 <template>
 	<view class="u-relative u-flex item">
-		<image lazy-load class="img" :src="data.coverImg" mode="" :style="computedImgStyle()"></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>{{data.name}}</view>
+				<view>
+					<text class="u-line-2">{{data.name}}</text>
+				</view>
 				<view class="u-font-32 font-bold u-m-t-16">
 					￥{{data.price}}
 				</view>

From 385c95a15ec49bc3000553e12b8c4728e367eebc Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:27:16 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/http.js | 5 ++++-
 manifest.json       | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 96e97d5..81590ba 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -17,7 +17,10 @@ import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 // 测试服
 let baseUrl = 'https://admintestpapi.sxczgkj.cn'
-// let baseUrl = 'http://192.168.1.15:8000'
+
+//预发布
+// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
+
 // 王伟本地测
 // let baseUrl = '/ww'
 // let baseUrl = 'http://192.168.1.15:8000'
diff --git a/manifest.json b/manifest.json
index a2393a0..064baed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -213,6 +213,15 @@
                         "/ysk" : ""
                     }
                 },
+				"/yufabu" : {
+				    // 需要被代理的后台地址
+				    "target" : "https://pre-cashier.sxczgkj.cn",
+				    "changeOrigin" : true,
+				    "secure" : false,
+				    "pathRewrite" : {
+				        "/yufabu" : ""
+				    }
+				},
                 "/ww" : {
                     // 需要被代理的后台地址
                     "target" : "http://192.168.1.15:8000",

From 1662622ce7b81ff40cf277adaf75bd80f40d53bf Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:55:29 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=85=A8=E9=83=A8=E6=94=B9=E4=B8=BA=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue     | 13 +++++++++++--
 pagesOrder/index/compoents/order-item.vue |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 3d43056..38b85a3 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -40,7 +40,13 @@
 										<view class="line-th color-666 ">￥{{item.salePrice||item.price}}</view>
 									</template>
 									<template v-else>
-										<view>￥{{item.salePrice||item.price}}</view>
+										<template v-if="item.priceAmount<=0">
+											<view>￥0.00</view>
+											<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
+										</template>
+										<template v-else>
+											<view>￥{{item.priceAmount}}</view>
+										</template>
 									</template>
 									<view class="u-m-t-22 color-999 u-font-24">X{{item.number||item.num}}</view>
 								</view>
@@ -130,6 +136,9 @@
 	import color from '@/commons/color.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 	
+	function returnTotalMoney(item){
+		return (item.price*item.num).toFixed(2)
+	}
 	function to2(n){
 		if(!n){
 			return 0
@@ -175,7 +184,7 @@
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.filter(v => v.isGift !== "true" && v.status !== "return").reduce((a,
 				b) => {
-				return a + (b.salePrice || b.price) * (b.number || b.num)
+				return a + b.priceAmount*1
 			}, 0)
 			return prve + curTotal
 		}, 0)
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index c9dcd6d..5a8bc8c 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -40,7 +40,7 @@
 						</view>
 						<view class="u-flex u-flex-1 u-row-right">
 							<view>×{{item.num}}</view>
-							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view>
+							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.priceAmount}}</view>
 						</view>
 					</view>
 				</view>

From 076fa01fef9e8a4d357c2c5c89e0dfb849cf5337 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 23 Oct 2024 13:49:57 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=80=E8=8F=9C=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E5=87=BA=E7=99=BB=E5=BD=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                  |  2 +-
 pages/login/index.vue                  |  3 +++
 pagesCreateOrder/index/index.vue       |  2 --
 pagesOrder/detail/components/extra.vue |  2 +-
 pagesOrder/detail/components/list.vue  | 20 ++++++++++++++------
 static/indexImg/icon-login-out.svg     |  1 +
 6 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 static/indexImg/icon-login-out.svg

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2673ea5..dde1183 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -229,7 +229,7 @@
 		
 		{
 			title: '退出登录',
-			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
+			icon: '/static/indexImg/icon-login-out.svg',
 			pageUrl: 'PAGES_LOGIN',
 			clickFunc:()=>{
 				storageManage.cleanByLogout()
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1db82fe..6f9bd90 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -254,6 +254,9 @@
 		if(e==1){
 			vdata.formData.merchantName = '18049104914'
 			vdata.formData.username = '13666666666'
+			vdata.formData.pwd = '123456'
+		}else{
+			vdata.formData.pwd = 'qwer1234'
 		}
 		// #endif
 	}
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index a4c3aac..1f4eaef 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -158,7 +158,6 @@
 		reactive,
 		ref,
 		nextTick,
-		getCurrentInstance,
 		watch
 	} from 'vue';
 	import myCar from './components/car'
@@ -179,7 +178,6 @@
 		canXiadan.value=await hasPermission('允许下单')
 	}
 	xiadanClick()
-	const instance = getCurrentInstance();
 	//临时菜
 	const lingshi = reactive({
 		show: false
diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index 0032d6b..7393980 100644
--- a/pagesOrder/detail/components/extra.vue
+++ b/pagesOrder/detail/components/extra.vue
@@ -5,7 +5,7 @@
 			<template v-if="orderInfo.status=='unpaid'&&data.status!='return'">
 				<my-button plain shape="circle" :width="160" :height="56" @click="tuicai">退菜</my-button>
 			</template>
-			<template v-if="orderInfo.status=='closed'">
+			<template v-if="orderInfo.status=='closed'&&data.status!='return'">
 				<my-button plain shape="circle" :width="160" :height="56"  @click="tuikuan">退款</my-button>
 			</template>
 		</view>
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 38b85a3..a18357e 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -60,12 +60,15 @@
 								@tap="tuicai(item,index)"><text class="no-wrap">退菜</text></my-button>
 						</view>
 					</template>
-					<template v-if="orderInfo.status=='closed'">
-						<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
-							<my-button :width="128" :height="48" plain shape="circle"
-								@tap="tuikuan(item,index)"><text class="no-wrap">退款</text> </my-button>
-						</view>
+					<template v-if="item.status!='refund'">
+						<template v-if="orderInfo.status=='closed'||orderInfo.status=='refund'">
+							<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
+								<my-button :width="128" :height="48" plain shape="circle"
+									@tap="tuikuan(item,index)"><text class="no-wrap">退款</text> </my-button>
+							</view>
+						</template>
 					</template>
+					
 				</view>
 			</view>
 			<!-- <view class="bg-gray u-p-20 u-m-t-20" v-if="orderInfo.remark">
@@ -134,6 +137,7 @@
 		computed
 	} from 'vue';
 	import color from '@/commons/color.js'
+	import {hasPermission} from '@/commons/utils/hasPermission.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 	
 	function returnTotalMoney(item){
@@ -151,7 +155,11 @@
 	}
 
 	function tuikuan(item, index) {
-		emits('tuikuan', item, index)
+		hasPermission('允许退款').then(res=>{
+			if(res){
+				emits('tuikuan', item, index)
+			}
+		})
 	}
 
 	function printOrder() {
diff --git a/static/indexImg/icon-login-out.svg b/static/indexImg/icon-login-out.svg
new file mode 100644
index 0000000..c78be7f
--- /dev/null
+++ b/static/indexImg/icon-login-out.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1729662523365" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4294" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 493.568c-32.256 0-58.88-26.112-58.88-58.88V58.88C453.12 26.112 479.744 0 512 0s58.88 26.112 58.88 58.88v375.808c0 32.256-26.624 58.88-58.88 58.88z" fill="#318AFE" p-id="4295"></path><path d="M512 1024c-273.92 0-496.64-222.72-496.64-496.64 0-202.752 121.344-382.976 309.248-459.776 30.208-12.288 64.512 2.048 76.8 32.256 12.288 30.208-2.048 64.512-32.256 76.8C225.792 235.008 133.12 372.736 133.12 527.36c0 208.896 169.984 378.88 378.88 378.88s378.88-169.984 378.88-378.88c0-154.624-92.672-292.352-236.032-351.232-30.208-12.288-44.544-46.592-32.256-76.8 12.288-30.208 46.592-44.544 76.8-32.256 187.904 76.8 309.248 257.024 309.248 459.776 0 274.432-222.72 497.152-496.64 497.152z" fill="#318AFE" p-id="4296"></path></svg>
\ No newline at end of file

From 48c01df8d0997db7614e3afcd74197f8bf6d1269 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 23 Oct 2024 14:27:00 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85apk?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 30 +++++++++++++++---------------
 开发文档.md   |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index 064baed..ae45d73 100644
--- a/manifest.json
+++ b/manifest.json
@@ -150,12 +150,12 @@
         "unipush" : {
             "enable" : true
         },
-        "plugins" : {
-            "WechatSI" : {
-                "version" : "0.3.5",
-                "provider" : "wx069ba97219f66d99"
-            }
-        },
+        // "plugins" : {
+        //     "WechatSI" : {
+        //         "version" : "0.3.5",
+        //         "provider" : "wx069ba97219f66d99"
+        //     }
+        // },
         "requiredBackgroundModes" : [ "audio", "location" ],
         "__usePrivacyCheck__" : true,
         "libVersion" : "latest"
@@ -213,15 +213,15 @@
                         "/ysk" : ""
                     }
                 },
-				"/yufabu" : {
-				    // 需要被代理的后台地址
-				    "target" : "https://pre-cashier.sxczgkj.cn",
-				    "changeOrigin" : true,
-				    "secure" : false,
-				    "pathRewrite" : {
-				        "/yufabu" : ""
-				    }
-				},
+                "/yufabu" : {
+                    // 需要被代理的后台地址
+                    "target" : "https://pre-cashier.sxczgkj.cn",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "/yufabu" : ""
+                    }
+                },
                 "/ww" : {
                     // 需要被代理的后台地址
                     "target" : "http://192.168.1.15:8000",
diff --git a/开发文档.md b/开发文档.md
index 93596f1..e5e608d 100644
--- a/开发文档.md
+++ b/开发文档.md
@@ -6,6 +6,8 @@
 发布APP:     HBuilderX 3.6.5 ( 3.6.11 app调试报错 )
 H5, 不影响。 
 
+###apk下载地址
+* <https://mp-3b7dba1a-2dfb-4c7a-a239-2ab2157f829a.cdn.bspapp.com/cloudstorage/__UNI__66E7BD0_20241023141536.apk>
 
 ### 全局文件结构
 * commons->utils>hasPermission.js 全局权限验证文件