From 4e1c3b132956aa68bc881aaca2a0b612225011c2 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 25 Jun 2025 23:08:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E4=B8=8B=E5=8D=95=E8=AF=AD=E9=9F=B3=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E7=BB=84=E4=BB=B6=E5=92=8C=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增VoicePlayer组件实现语音播放功能，优化订单页面显示快捷下单内容
在订单确认页添加语音播放和图片预览功能，增加已下单状态显示
修复分类页和订单页的快捷下单刷新逻辑，更新环境配置为生产环境
---
 components/VoicePlayer.vue      | 189 ++++++++++++++++++++++++++++++++++++++++
 config.js                       |   2 +-
 mixins/order.js                 |   8 +-
 pages/index/category.vue        |   8 +-
 pages/index/center.vue          |   1 +
 pages/index/index.vue           |   1 +
 pages/index/order.vue           |   1 +
 pages_order/auth/wxLogin.vue    |   5 ++
 pages_order/mine/purse.vue      |   5 +-
 pages_order/order/firmOrder.vue | 111 ++++++++++++++++++++++-
 utils/position.js               |   4 +-
 11 files changed, 323 insertions(+), 12 deletions(-)
 create mode 100644 components/VoicePlayer.vue

diff --git a/components/VoicePlayer.vue b/components/VoicePlayer.vue
new file mode 100644
index 0000000..02562ea
--- /dev/null
+++ b/components/VoicePlayer.vue
@@ -0,0 +1,189 @@
+<template>
+	<view class="voice-content">
+		<view class="voice-item">
+			<view class="voice-icon">
+				<uv-icon name="mic" size="40rpx" color="#D03F25"></uv-icon>
+			</view>
+			<view class="voice-info">
+				<text class="voice-desc">通过语音识别下单</text>
+				<text class="voice-tip">点击播放语音内容</text>
+			</view>
+			<view class="voice-play" @click="playVoice">
+				<uv-icon :name="isPlaying ? 'pause-circle-fill' : 'play-circle-fill'" size="50rpx" color="#D03F25"></uv-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'VoicePlayer',
+		props: {
+			voiceUrl: {
+				type: String,
+				default: ''
+			},
+			autoPlay: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				innerAudioContext: null, // 音频播放器
+				isPlaying: false // 是否正在播放语音
+			};
+		},
+		mounted() {
+			this.initAudioPlayer();
+		},
+		beforeDestroy() {
+			this.destroyAudioPlayer();
+		},
+		methods: {
+			// 初始化音频播放器
+			initAudioPlayer() {
+				this.innerAudioContext = uni.createInnerAudioContext();
+				
+				// 监听播放结束事件
+				this.innerAudioContext.onEnded(() => {
+					console.log('播放结束');
+					this.isPlaying = false;
+					this.$emit('playEnded');
+				});
+				
+				// 监听播放开始事件
+				this.innerAudioContext.onPlay(() => {
+					console.log('开始播放');
+					this.isPlaying = true;
+					this.$emit('playStarted');
+				});
+				
+				// 监听播放暂停事件
+				this.innerAudioContext.onPause(() => {
+					console.log('播放暂停');
+					this.isPlaying = false;
+					this.$emit('playPaused');
+				});
+				
+				// 监听播放停止事件
+				this.innerAudioContext.onStop(() => {
+					console.log('播放停止');
+					this.isPlaying = false;
+					this.$emit('playStopped');
+				});
+				
+				// 监听播放错误事件
+				this.innerAudioContext.onError((err) => {
+					console.error('播放错误', err);
+					uni.showToast({
+						title: '播放失败',
+						icon: 'none'
+					});
+					this.isPlaying = false;
+					this.$emit('playError', err);
+				});
+			},
+			
+			// 销毁音频播放器
+			destroyAudioPlayer() {
+				if (this.innerAudioContext) {
+					this.innerAudioContext.destroy();
+					this.innerAudioContext = null;
+				}
+			},
+			
+			// 播放语音
+			playVoice() {
+				if (!this.voiceUrl) {
+					uni.showToast({
+						title: '语音文件不存在',
+						icon: 'none'
+					});
+					return;
+				}
+				
+				if (this.isPlaying) {
+					// 如果正在播放，则停止播放
+					this.innerAudioContext.stop();
+					this.isPlaying = false;
+					return;
+				}
+				
+				// 设置音频源并播放
+				this.innerAudioContext.src = this.voiceUrl;
+				this.innerAudioContext.play();
+				
+				uni.showToast({
+					title: '正在播放语音',
+					icon: 'none'
+				});
+			},
+			
+			// 停止播放
+			stopPlay() {
+				if (this.innerAudioContext && this.isPlaying) {
+					this.innerAudioContext.stop();
+				}
+			},
+			
+			// 暂停播放
+			pausePlay() {
+				if (this.innerAudioContext && this.isPlaying) {
+					this.innerAudioContext.pause();
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.voice-content {
+		padding: 30rpx;
+		
+		.voice-item {
+			display: flex;
+			align-items: center;
+			padding: 30rpx;
+			background-color: #f9f9f9;
+			border-radius: 12rpx;
+			
+			.voice-icon {
+				width: 80rpx;
+				height: 80rpx;
+				background-color: rgba(208, 63, 37, 0.1);
+				border-radius: 40rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 30rpx;
+			}
+			
+			.voice-info {
+				flex: 1;
+				
+				.voice-desc {
+					display: block;
+					font-size: 30rpx;
+					color: #333;
+					margin-bottom: 8rpx;
+				}
+				
+				.voice-tip {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+			
+			.voice-play {
+				width: 80rpx;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: rgba(208, 63, 37, 0.1);
+				border-radius: 40rpx;
+			}
+		}
+	}
+</style> 
\ No newline at end of file
diff --git a/config.js b/config.js
index 4c91149..068f8c7 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'local'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/mixins/order.js b/mixins/order.js
index 9371ed4..9967841 100644
--- a/mixins/order.js
+++ b/mixins/order.js
@@ -23,7 +23,13 @@ export default {
                 type : 1,
 			}, res => {
 				if(res.code == 200){
-					uni.requestPaymentWxPay(res)
+					if(res.result.id){
+						this.id = res.result.id
+					}
+					this.getData()
+					uni.requestPaymentWxPay({
+						result : res.result.pay || res.result
+					})
 					.then(res => {
 						uni.showToast({
 							title: '支付成功',
diff --git a/pages/index/category.vue b/pages/index/category.vue
index f2ca63a..ab7d4a0 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -92,14 +92,16 @@
 					return {}
 				}
 				
-				return this.category[this.current].children[this.currentChildren]
+				return this.category[this.current].children[this.currentChildren] || this.category[this.current]
 			},
 		},
 		onLoad() {
 			this.getCategory()
 		},
 		onShow() {
-           this.$refs.quickOrderEntry.refresh();
+			if(uni.getStorageSync('token')){
+			   this.$refs.quickOrderEntry.refresh();
+			}
 		},
 		methods: {
 			clickTabs({index}){
@@ -137,7 +139,7 @@
 			},
 			change(index) {
 				this.currentChildren = index;
-				if(this.category[index]) {
+				if(this.selectCategory.id) {
 					this.$nextTick(() => {
 						this.getProductList()
 					})
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 5339770..4268c9d 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -163,6 +163,7 @@
 			if(uni.getStorageSync('token')){
 				// 刷新快捷下单信息
                 this.$store.commit('getUserInfo')
+				this.$refs.quickOrderEntry.refresh()
             }
 		},
 		methods: {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4693dc8..5d199b9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -119,6 +119,7 @@ export default {
 		this.getMenu()
 		if(uni.getStorageSync('token')){
             this.$store.commit('getUserInfo')
+			this.$refs.quickOrderEntry.refresh()
 		}
 	},
     methods: {
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 00709b2..a33648a 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -115,6 +115,7 @@ export default {
     },
     onShow() {
         this.getData()
+		this.$refs.quickOrderEntry.refresh()
     },
     //滚动到屏幕底部
     onReachBottom() {
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 1fe65de..a5a3c08 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -58,6 +58,11 @@
 				checkboxValue : []
 			}
 		},
+		onLoad(query) {
+			if (query.shareId) {
+				uni.setStorageSync('shareId', query.shareId)
+			}
+		},
 		methods: {
 			qux(){
 				uni.reLaunch({
diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue
index 9fe8f12..f88984d 100644
--- a/pages_order/mine/purse.vue
+++ b/pages_order/mine/purse.vue
@@ -75,8 +75,11 @@
 				<input placeholder="请输入银行卡卡号" />
 			</view> -->
 			<view class="mt56">提现说明</view>
-			<view style="line-height: 45rpx; font-size: 24rpx;color: #666666;" v-html="notice">
+			
+			<view style="color: #777;font-size: 26rpx;">
+				<uv-parse :content="configList.withdrawal_instructions"></uv-parse>
 			</view>
+			
 			<!-- <p>1、本次提现必须通过银行卡提现，暂不支持其他途径。</p>
 				<p>2、如若遇到24小时提现未到账，请联系客服。</p> -->
 		</view>
diff --git a/pages_order/order/firmOrder.vue b/pages_order/order/firmOrder.vue
index 1c93417..0cdd6be 100644
--- a/pages_order/order/firmOrder.vue
+++ b/pages_order/order/firmOrder.vue
@@ -9,6 +9,30 @@
         <!-- 商品信息 -->
         <view class="content-wrapper">
 			
+			<!-- 快捷下单内容展示 -->
+			<view class="quick-order-content" v-if="quickOrderContent.type">
+				<view class="section-wrapper">
+					<view class="section-title">
+						<view class="title-bar"></view>
+						<text>{{getOrderTypeName(quickOrderContent.type)}}</text>
+					</view>
+					
+					<!-- 拍照订单显示图片 -->
+					<view class="photo-content" v-if="quickOrderContent.type === '0' && quickOrderContent.imageUrl">
+						<image :src="quickOrderContent.imageUrl" mode="aspectFill" class="order-image" @click="previewImage"></image>
+					</view>
+					
+					<!-- 语音订单显示语音信息 -->
+					<voice-player 
+						v-if="quickOrderContent.type === '2' && quickOrderContent.voiceUrl"
+						:voiceUrl="quickOrderContent.voiceUrl"
+						@playStarted="onVoicePlayStarted"
+						@playEnded="onVoicePlayEnded"
+						@playError="onVoicePlayError"
+					></voice-player>
+				</view>
+			</view>
+			
 			<uv-checkbox-group
 			shape="circle"
 			v-model="checkboxValue">
@@ -93,10 +117,14 @@
         </view>
         
         <!-- 底部按钮 -->
-        <view class="order-submit">
+        <view class="order-submit" v-if="productInfo.isPay != 'Y'">
 			<button class="submit-btn-close" @click="cancelOrderFast">取消</button>
             <button class="submit-btn" @click="submitOrder">快捷下单（￥{{ totalPrice }}）</button>
         </view>
+
+        <view class="order-submit" v-else>
+            <button class="submit-btn" style="background-color: #999999; color: #cccccc;">已下单</button>
+		</view>
         
         <!-- 地址选择弹窗 -->
         <uv-popup ref="addressPopup" :round="30" style="padding-bottom: 90rpx;">
@@ -113,10 +141,12 @@
 <script>
     import redactAddressForm from '../components/address/redactAddressForm.vue';
     import addressList from '../components/address/addressList.vue';
+	import VoicePlayer from '@/components/VoicePlayer.vue';
 	export default {
 		components: {
 		    redactAddressForm,
-            addressList
+            addressList,
+			VoicePlayer
 		},
 		data() {
 			return {
@@ -133,7 +163,12 @@
                 addressTotal: 0,
                 orderInfo: [],
                 isLoading: false, // 加载状态
-                shouldSubmitOrder: false // 标记是否应该在获取地址后自动提交订单
+                shouldSubmitOrder: false, // 标记是否应该在获取地址后自动提交订单
+				quickOrderContent: { // 快捷下单内容
+					type: '',
+					imageUrl: '',
+					voiceUrl: ''
+				}
 			};
 		},
 		computed: {
@@ -161,6 +196,7 @@
             // 获取地址列表
             this.getAddressList();
         },
+
 		methods: {
 		    // 获取订单信息
 		    getOrderInfo() {
@@ -197,6 +233,13 @@
 						console.log(res.result);
 						
 						this.productInfo = res.result;
+						
+						// 提取快捷下单内容
+						this.quickOrderContent = {
+							type: res.result.type || '',
+							imageUrl: res.result.imageUrl || '',
+							voiceUrl: res.result.voiceUrl || ''
+						};
 			        }
 			    });
 		    },
@@ -335,6 +378,7 @@
 		        this.$api('createSumOrder', data, res => {
                     uni.hideLoading();
 		            if (res.code === 200) {
+                        this.productInfo.isPay = 'Y'
 						uni.$emit('getQuickOrderInfo')
 		                uni.requestPaymentWxPay(res)
 		                .then(e => {
@@ -383,13 +427,52 @@
 					}
 				})
 			},
+			
+			// 获取订单类型名称
+			getOrderTypeName(type) {
+				const typeMap = {
+					'0': '拍照下单',
+					'2': '语音下单'
+				};
+				return typeMap[type] || '快捷下单';
+			},
+			
+			// 预览图片
+			previewImage() {
+				if (!this.quickOrderContent.imageUrl) {
+					uni.showToast({
+						title: '图片不存在',
+						icon: 'none'
+					});
+					return;
+				}
+				
+				uni.previewImage({
+					current: this.quickOrderContent.imageUrl,
+					urls: [this.quickOrderContent.imageUrl]
+				});
+			},
+			
+			// 语音播放开始事件
+			onVoicePlayStarted() {
+				console.log('语音播放开始');
+			},
+			
+			// 语音播放结束事件
+			onVoicePlayEnded() {
+				console.log('语音播放结束');
+			},
+			
+			// 语音播放错误事件
+			onVoicePlayError(error) {
+				console.error('语音播放错误', error);
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 .hand-firm {
-    min-height: 100vh;
     background-color: #f6f6f6;
     padding-bottom: 120rpx;
     
@@ -598,5 +681,25 @@
             border-radius: 45rpx;
         }
     }
+	
+	.quick-order-content {
+		.photo-content {
+			padding: 30rpx;
+			text-align: center;
+			
+			.order-image {
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 12rpx;
+				margin-bottom: 20rpx;
+				background-color: #f9f9f9;
+			}
+			
+			.image-desc {
+				font-size: 26rpx;
+				color: #666;
+			}
+		}
+	}
 }
 </style>
diff --git a/utils/position.js b/utils/position.js
index 09513cd..26210b6 100644
--- a/utils/position.js
+++ b/utils/position.js
@@ -144,8 +144,8 @@ function getUserAddressByIp(key) { //根据IP获取当前用户位置
 //打开地图让用户选择位置
 function selectAddress(longitude, latitude, successCallback) {
 	uni.chooseLocation({
-		longitude, //经度
-		latitude, //纬度
+		// longitude, //经度
+		// latitude, //纬度
 		success: function(res) {
 			successCallback && successCallback(res)
 		}