更新gh分支

pagesCreateOrder/order-detail/components/step.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
-		<my-steps :dot="true" current="0" direction="column">
-			<my-steps-item title="2024-09-02 09:19" :itemStyle="itemStyle" desc="[东风(id:124413)]使用代客下单提交。(未打印预结单)">
-			</my-steps-item>
-			<my-steps-item title="2024-09-02 09:19" desc="[东风(id:124413)]使用代客下单提交。(未打印预结单)">
-			</my-steps-item>
-		</my-steps>
+		<up-steps :dot="true" current="0" direction="column">
+			<up-steps-item title="2024-09-02 09:19" :itemStyle="itemStyle" desc="[东风(id:124413)]使用代客下单提交。(未打印预结单)">
+			</up-steps-item>
+			<up-steps-item title="2024-09-02 09:19" desc="[东风(id:124413)]使用代客下单提交。(未打印预结单)">
+			</up-steps-item>
+		</up-steps>
 
 	</view>
 

pagesCreateOrder/order-detail/components/user.vue

@@ -3,7 +3,7 @@
 		<view class="change u-absolute my-bg-main color-fff  left-top" >切换</view>
 		<view class="u-flex	u-row-between u-m-t-20 border-bottom u-p-b-20">
 			<view class="u-flex">
-				<my-avatar :size="30"></my-avatar>
+				<up-avatar :size="30"></up-avatar>
 				<view class="color-666 u-m-l-30">未绑定手机号</view>
 			</view>
 			<view>

pagesCreateOrder/pay-order/pay-order.vue

@@ -59,7 +59,8 @@
 <script setup>
 	import {
 		reactive,
-		onMounted
+		onMounted,
+		watch
 	} from 'vue';
 	import {
 		onLoad
@@ -68,7 +69,7 @@
 	import infoBox from '@/commons/utils/infoBox.js'
 	import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
 	const pays = reactive({
-		list: ['普通支付', '混合支付'],
+		list: ['扫码收款', '二维码收款'],
 		payTypes: {
 			list: [],
 			selIndex: 0
@@ -90,7 +91,7 @@
 
 	async function getPayType() {
 		const payTypeList = await Api.$getPayType()
-		pays.payTypes.list = payTypeList.filter(v=>v.payType!='scanCode')
+		pays.payTypes.list = payTypeList
 	}
 
 	function changePayType(i) {
@@ -98,7 +99,7 @@
 	}
 
 	async function payOrder() {
-		const payType=pays.payTypes.list[pays.payTypes.selIndex].payType
+		const payType = pays.payTypes.list[pays.payTypes.selIndex].payType
 		await Api.$payOrder({
 			tableId: order.tableId,
 			masterId: order.masterId,
@@ -109,10 +110,10 @@
 			code: ''
 		})
 		infoBox.showToast('支付成功')
-		setTimeout(()=>{
+		setTimeout(() => {
 			uni.$emit('orderDetail:update')
 			uni.navigateBack()
-		},500)
+		}, 500)
 	}
 	onMounted(() => {
 		getPayType()
@@ -120,6 +121,29 @@
 	const order = reactive({
 		amount: 0
 	})
+	function saoma(){
+		uni.scanCode({
+			onlyFromCamera: true,
+			success: function (res) {
+				console.log('条码类型：' + res.scanType);
+				console.log('条码内容：' + res.result);
+			}
+		});
+	}
+	watch(() => pays.payTypes.selIndex, (index) => {
+		const item = pays.payTypes.list[index]
+		if (item.payType == "vipPay") {
+			return 
+		}
+		if (item.payType == "deposit") {
+			//储值卡支付
+			return saoma()
+		}
+		if (item.payType == "scanCode") {
+			//扫码支付
+			return saoma()
+		}
+	})
 	onLoad((opt) => {
 		Object.assign(order, opt)
 	})