Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb

pageProduct/index/components/edit-price.vue

@@ -89,7 +89,8 @@
 		reactive,
 		ref,
 		watch,
-		nextTick
+		nextTick,
+		onMounted
 	} from 'vue';
 	import {
 		returnSkuSnap,
@@ -138,7 +139,10 @@
 			}
 		}
 	})
-	let data = ref(props.goods)
+	let data = ref({
+		lowPrice: 0,
+		skuList: []
+	})
 	const rules = {
 		'lowPrice': [{
 				type: 'Number',
@@ -221,6 +225,10 @@
 	// 		skuSnap: JSON.stringify(skuSnap)
 	// 	})
 	// }
+	
+	onMounted(()=>{
+		refForm.value.setRules(rules)
+	})
 </script>
 
 <style lang="scss" scoped>

pageProduct/index/components/edit-stock.vue

@@ -170,7 +170,9 @@
 		active: 0
 	})
 
-	const data = ref(props.goods)
+	const data = ref({
+		name:''
+	})
 	const emits = defineEmits(['update:show', 'save'])
 	const form = reactive({
 		note: ''
@@ -252,6 +254,10 @@
 	// 		skuSnap: JSON.stringify(skuSnap)
 	// 	})
 	// }
+	
+	onMounted(()=>{
+		refForm.value.setRules(rules)
+	})
 </script>
 
 <style lang="scss" scoped>

pageProduct/invoicing-list/invoicing-list.vue

@@ -67,7 +67,7 @@
 
 		</view>
 
-	<my-date-pickerview @confirm="datePickerConfirm" ref="datePicker"></my-date-pickerview>
+	<my-date-pickerview @confirm="datePickerConfirm" ref="datePicker" mode="all"></my-date-pickerview>
 	<my-mask ref="mask" @close="hideType"></my-mask>
 	</view>
 

pages/index/index.vue

@@ -164,6 +164,11 @@
 			icon: '/static/indexImg/icon-line-up.svg',
 			pageUrl: 'PAGES_LINE_UP'
 		},
+		{
+			title: '霸王餐',
+			icon: '/static/indexImg/icon-bwc.svg',
+			pageUrl: 'PAGES_BWC'
+		},
 		// {
 		// 	title: '成员管理',
 		// 	icon: '/static/indexImg/icon-staff.svg',

pagesOrder/detail/components/list.vue

@@ -109,7 +109,7 @@
 				<view class="u-flex u-row-between u-m-t-32">
 					<view>退款金额</view>
 					<view class="color-999">
-						<text class="">{{orderInfo.refundAmount}}</text>
+						<text class="">{{(orderInfo.refundAmount).toFixed(2)}}</text>
 					</view>
 				</view>
 				<view class="u-flex u-row-between u-m-t-32">

pagesOrder/detail/components/tuicai.vue

@@ -50,7 +50,7 @@
 			<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
 				<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
 				<view class="u-m-t-10">
-					<my-button @tap="toggleModelShow" shape="circle" bgColor="#fff" type="cancel"
+					<my-button @tap="onModelClose" shape="circle" bgColor="#fff" type="cancel"
 						box-shadow>取消</my-button>
 				</view>
 			</view>
@@ -138,7 +138,8 @@
 	function toggleModelShow(show) {
 		modelShow.value = show ? true : false
 	}
-
+	
+	
 	function onModelClose() {
 		number.value=1
 		modelShow.value = false

static/indexImg/icon-bwc.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><defs><style>.a{fill:#80bcff;}.b{clip-path:url(#a);}.c{fill:#4c99fe;}.d{fill:#197dff;}</style><clipPath id="a"><rect class="a" width="32" height="32" transform="translate(163.875 960.295)"/></clipPath></defs><g class="b" transform="translate(-163.875 -960.295)"><g transform="translate(100.986 897.396)"><path class="c" d="M87.826,261.867A14.372,14.372,0,0,1,67.559,241.6l7.645,7.645h-1.21v1.686h2.9l1.157,1.157v1.54H73.994v1.686h4.052v3.408h1.686v-3.408h1.54l6.554,6.554Z" transform="translate(0 -171.638)"/><path class="d" d="M225.743,68.306a14.372,14.372,0,0,0-19.534-.737c-.271.231-.535.479-.79.734-.142.142-.281.291-.42.436l7.324,7.324,1.54,1.54.44.44.552.552.694.694,2.7,2.7,1.686,1.686,5.374,5.374c.149-.139.294-.278.436-.42.258-.258.5-.519.734-.79A14.371,14.371,0,0,0,225.743,68.306Zm-15.815,2.981.856-.568,2.849,4.274Zm6.736,6.739-.416-.416-.8-.8,4.062-6.091,1.4.935-3.97,5.949h3.1v1.686h-2.109l-1.273-1.266Z" transform="translate(-136.258)"/><path class="d" d="M129.024,92.724a.838.838,0,0,1-1.19,0l-3.19-3.19-5.374-5.371-1.686-1.686-2.7-2.7-.694-.694-.552-.552-.44-.44-1.54-1.54-7.324-7.324-3.19-3.19a.844.844,0,0,1,1.193-1.193l3.209,3.209,3.718,3.718,6.32,6.32.416.416,13.019,13.019A.842.842,0,0,1,129.024,92.724Z" transform="translate(-35.599 -0.488)"/></g></g></svg>