11-29-1

pages/received/index.vue

@@ -209,7 +209,8 @@ export default {
 	},
 	onShow() {
 		// 开启倒计时
-		this.setTimePay();
+		this.setTimePay();
+		// Voice('打开收款码成功')
 	},
 	onHide() {
 		this.outInterval()

pages/set/phone.vue

@@ -17,8 +17,9 @@
 
 <script>
 import { verify } from '@/api/login.js';
-import { mapState } from 'vuex';
-import { registerReset, binding } from '@/api/set.js';
+import { mapState, mapMutations} from 'vuex';
+import { registerReset, binding } from '@/api/set.js';
+import { getUserInfo } from '@/api/login.js';
 export default {
 	data() {
 		return {
@@ -49,7 +50,8 @@ export default {
 			this.show = false;
 		}
 	},
-	methods: {
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		//发送验证码
 		verification() {
 			let obj = this;
@@ -92,7 +94,7 @@ export default {
 					setTimeout(function() {
 						obj.loding = false;
 						uni.switchTab({
-							url: '/pages/user/user'
+							url: '/pages/index/index'
 						});
 					}, 1000);
 				})

pages/user/user.vue

@@ -427,7 +427,7 @@ export default {
 				card_password: this.pwd,
 				type: 0,
 				is_confirm: 1,
-				// reg_store_id: this.storeInfo.id
+				reg_store_id: this.storeInfo.id
 			})
 				.then(e => {
 					console.log(e);

pages/wallet/openMember.vue

@@ -263,7 +263,12 @@ export default {
 			// 		content: '请选择要开通的会员'
 			// 	});
 			// } else {
-			// }
+			// }
+			if(this.choose == 0) {
+				if(!this.storeInfo.name) {
+					return this.$api.msg('请选择门店')
+				}
+			}
 				console.log('打开支付弹窗');
 				this.$refs.popupPay.open();
 		},
@@ -338,7 +343,7 @@ export default {
 					mask: true
 				});
 				console.log(obj.storeInfo,'654321')
-				if(obj.choose == 0 && obj.storeInfo.name == ''){
+				if(obj.choose == 0 && !obj.storeInfo.name){
 					this.$api.msg('请选择门店')
 					return
 				}

utils/QS-baiduyy.js

@@ -1,217 +1,227 @@
-import request from '@/utils/request'
-const audioTeam = [];
-let audioStartSwitch = false;
-const getAudioUrl = 'https://tsn.baidu.com/text2audio';
-/**
- * 浏览器调用语音合成接口
- * 请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
- * 强烈建议后端访问接口获取token返回给前端
- * client_id = API Key & client_secret = secret Key
- * 获取token接口: https://openapi.baidu.com/oauth/2.0/token?grant_type=client_credentials&client_id=uFYiXWMCiYvx68V4EVyCGeL8j4GAzXD5&client_secret=897Mm2qCj7bC1eHYVDxaWrO38FscTOHD
- */
-
-function getBDVoicToken() {
-	return new Promise((rs, rj) => {
-		console.log('准备访问接口获取语音token')
-		request({
-			url: '/api/baidutoken',
-			method: 'get',
-		}).then((res) => {
-			console.log('访问成功');
-			rs(res);
-		}).catch((err) => {
-			console.log('访问失败');
-			rj(err);
-		});
-	})
-}
-
-export default function openVoice(objs) { // 传入需转为语音的文本内容
-	let lineUp = false;
-	let returnAudio = false;
-	if (typeof(objs) !== 'string') {
-		if (objs && objs.lineUp === true) {
-			lineUp = true;
-		}
-		if (objs && objs.returnAudio === true) {
-			returnAudio = true;
-		}
-	}
-	if (returnAudio) {
-		return new Promise((resolve, reject) => {
-			openVoiceFc(objs, returnAudio).then(res => {
-				resolve(res);
-			}).catch(err => {
-				reject(err)
-			});
-		})
-	}
-	if (lineUp = true) {
-		audioTeam.push(objs);
-	}
-	console.log(audioTeam);
-	if (!audioStartSwitch) {
-		audioStartSwitch = true;
-		openVoiceFc(objs);
-	}
-}
-
-function openVoiceFc(objs, returnAudio) {
-	console.log('准备获取语音tok');
-	if (returnAudio) {
-		return new Promise((resolve, reject) => {
-			getBDVoicToken().then(res => {
-				console.log('获取语音tok接口成功');
-				if (res.data && res.data.access_token) {
-					console.log('token: ' + res.data.access_token);
-					resolve(tts(objs, res.data.access_token, returnAudio));
-				} else {
-					console.log('获取语音tok接口为空');
-					reject('获取语音tok接口为空');
-				}
-			}).catch(err => {
-				console.log('获取语音tok接口失败');
-				reject(err || '获取语音tok接口失败');
-			})
-		})
-	} else {
-		getBDVoicToken().then(res => {
-			console.log('获取语音tok接口成功');
-			if (res.data && res.data.access_token) {
-				console.log('token: ' + res.data.access_token);
-				tts(objs, res.data.access_token);
-			} else {
-				console.log('获取语音tok接口为空');
-			}
-		}).catch(err => {
-			console.log('获取语音tok接口失败');
-		})
-	}
-}
-
-function tts(objs, tok, returnAudio) {
-	if (typeof(objs) == 'string')
-		objs = {
-			voiceSet: {
-				tex: objs
-			}
-		};
-	const data = {
-		tok,
-		cuid: tok,
-		ctp: 1,
-		lan: 'zh',
-		...objs.voiceSet
-	}
-	if (returnAudio) {
-		return btts(data, objs.audioSet, objs.audioCallback, objs.lineUp, returnAudio);
-	}
-	btts(data, objs.audioSet, objs.audioCallback, objs.lineUp, returnAudio);
-}
-
-function setAudioSet(options, audio) {
-	console.log('设置语音播放', options);
-	if (options) {
-		audio.volume = options.volume || 1;
-		audio.startTime = options.startTime || 0;
-		audio.loop = options.loop || false;
-		// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO
-		audio.obeyMuteSwitch = options.obeyMuteSwitch && typeof(options.obeyMuteSwitch) == 'boolean' ? options.obeyMuteSwitch :
-			true; //支持微信小程序、百度小程序、头条小程序
-		// #endif
-	}
-}
-
-function btts(param, options, audioCallback, lineUp, returnAudio) {
-	let audio = uni.createInnerAudioContext();
-	setAudioSet(options, audio);
-	// 序列化参数列表
-	let fd = [];
-	for (let k in param) {
-		fd.push(k + '=' + encodeURIComponent(encodeURIComponent(param[k])));
-	}
-	audio.src = `${getAudioUrl}?${fd.join('&')}`;
-
-	if (returnAudio) {
-		audio.onEnded(() => {
-			console.log('音频播放结束');
-			console.log('销毁音频实例');
-			audio.destroy(); //销毁音频实例
-			audio = null;
-		})
-		audio.onError((e) => {
-			if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback.onError(e);
-			console.log('音频播放错误: ' + JSON.stringify(e));
-			console.log('销毁音频实例');
-			audio.destroy(); //销毁音频实例
-			audio = null;
-		})
-		return audio;
-	}
-	console.log(audio);
-	audio.onPlay(() => {
-		console.log('音频播放开始');
-		if (audioCallback && audioCallback.onPlay && typeof(audioCallback.onPlay) == 'function') {
-			audioCallback.onPlay();
-		}
-	})
-	audio.onPause(() => {
-		if (audioCallback && audioCallback.onPause && typeof(audioCallback.onPause) == 'function') {
-			audioCallback.onPause();
-		}
-	})
-	audio.onWaiting(() => {
-		if (audioCallback && audioCallback.onWaiting && typeof(audioCallback.onWaiting) == 'function') {
-			audioCallback.onWaiting();
-		}
-	})
-	audio.onStop(() => {
-		if (audioCallback && audioCallback.onStop && typeof(audioCallback.onStop) == 'function') {
-			audioCallback.onStop();
-		}
-	})
-	audio.onTimeUpdate(() => {
-		if (audioCallback && audioCallback.onTimeUpdate && typeof(audioCallback.onTimeUpdate) == 'function') {
-			audioCallback.onTimeUpdate();
-		}
-	})
-	audio.onSeeking(() => {
-		if (audioCallback && audioCallback.onSeeking && typeof(audioCallback.onSeeking) == 'function') {
-			audioCallback.onSeeking();
-		}
-	})
-	audio.onSeeked(() => {
-		if (audioCallback && audioCallback.onSeeked && typeof(audioCallback.onSeeked) == 'function') {
-			audioCallback.onSeeked();
-		}
-	})
-	audio.onEnded(() => {
-		console.log('音频播放结束');
-		console.log('销毁音频实例');
-		audio.destroy(); //销毁音频实例
-		audio = null;
-		// 清除播报列表对象数据
-		if (audioCallback && audioCallback.onEnded && typeof(audioCallback.onEnded) == 'function') {
-			audioCallback.onEnded();
-		}
-		if (lineUp !== false) {
-			// 删除已经播放对象
-			audioTeam.splice(0, 1);
-			if (audioTeam.length > 0) {
-				console.log('队列中');
-				openVoiceFc(audioTeam[0]);
-			} else {
-				console.log('队列为零');
-				audioStartSwitch = false;
-			}
-		}
-	})
-	audio.onError((e) => {
-		if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback.onError(e);
-		console.log('音频播放错误: ' + JSON.stringify(e));
-		console.log('销毁音频实例');
-		audio.destroy(); //销毁音频实例
-		audio = null;
-	})
-	audio.play();
+import request from '@/utils/request'
+const audioTeam = [];
+let audioStartSwitch = false;
+const getAudioUrl = 'https://tsn.baidu.com/text2audio';
+/**
+ * 浏览器调用语音合成接口
+ * 请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
+ * 强烈建议后端访问接口获取token返回给前端
+ * client_id = API Key & client_secret = secret Key
+ * 获取token接口: https://openapi.baidu.com/oauth/2.0/token?grant_type=client_credentials&client_id=uFYiXWMCiYvx68V4EVyCGeL8j4GAzXD5&client_secret=897Mm2qCj7bC1eHYVDxaWrO38FscTOHD
+ */
+
+function getBDVoicToken() {
+	return new Promise((rs, rj) => {
+		console.log('准备访问接口获取语音token')
+		request({
+			url: '/api/baidutoken',
+			method: 'get',
+		}).then((res) => {
+			console.log('访问成功');
+			rs(res);
+		}).catch((err) => {
+			console.log('访问失败');
+			rj(err);
+		});
+	})
+}
+
+export default function openVoice(objs) { // 传入需转为语音的文本内容
+	let lineUp = false;
+	let returnAudio = false;
+	if (typeof(objs) !== 'string') {
+		if (objs && objs.lineUp === true) {
+			lineUp = true;
+		}
+		if (objs && objs.returnAudio === true) {
+			returnAudio = true;
+		}
+	}
+	if (returnAudio) {
+		return new Promise((resolve, reject) => {
+			openVoiceFc(objs, returnAudio).then(res => {
+				resolve(res);
+			}).catch(err => {
+				reject(err)
+			});
+		})
+	}
+	if (lineUp = true) {
+		audioTeam.push(objs);
+	}
+	console.log(audioTeam);
+	if (!audioStartSwitch) {
+		audioStartSwitch = true;
+		openVoiceFc(objs);
+	}
+}
+
+function openVoiceFc(objs, returnAudio) {
+	console.log('准备获取语音tok');
+	if (returnAudio) {
+		return new Promise((resolve, reject) => {
+			getBDVoicToken().then(res => {
+				console.log('获取语音tok接口成功');
+				if (res.data && res.data.access_token) {
+					console.log('token: ' + res.data.access_token);
+					resolve(tts(objs, res.data.access_token, returnAudio));
+				} else {
+					console.log('获取语音tok接口为空');
+					reject('获取语音tok接口为空');
+				}
+			}).catch(err => {
+				console.log('获取语音tok接口失败');
+				reject(err || '获取语音tok接口失败');
+			})
+		})
+	} else {
+		getBDVoicToken().then(res => {
+			console.log('获取语音tok接口成功', res.data);
+			if (res.data && res.data.access_token) {
+				console.log('token: ' + res.data.access_token);
+				tts(objs, res.data.access_token);
+			} else {
+				console.log('获取语音tok接口为空');
+			}
+		}).catch(err => {
+			console.log('获取语音tok接口失败');
+		})
+	}
+}
+
+function tts(objs, tok, returnAudio) {
+	if (typeof(objs) == 'string')
+		objs = {
+			voiceSet: {
+				tex: objs
+			}
+		};
+	const data = {
+		tok,
+		cuid: tok,
+		ctp: 1,
+		lan: 'zh',
+		...objs.voiceSet
+	}
+	if (returnAudio) {
+		return btts(data, objs.audioSet, objs.audioCallback, objs.lineUp, returnAudio);
+	}
+	btts(data, objs.audioSet, objs.audioCallback, objs.lineUp, returnAudio);
+}
+
+function setAudioSet(options, audio) {
+	console.log('设置语音播放', options);
+	if (options) {
+		audio.volume = options.volume || 1;
+		audio.startTime = options.startTime || 0;
+		audio.loop = options.loop || false;
+		// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO
+		audio.obeyMuteSwitch = options.obeyMuteSwitch && typeof(options.obeyMuteSwitch) == 'boolean' ? options
+			.obeyMuteSwitch :
+			true; //支持微信小程序、百度小程序、头条小程序
+		// #endif
+	}
+}
+
+function btts(param, options, audioCallback, lineUp, returnAudio) {
+	let audio = uni.createInnerAudioContext();
+	setAudioSet(options, audio);
+	// 序列化参数列表
+	let fd = [];
+	for (let k in param) {
+		fd.push(k + '=' + encodeURIComponent(encodeURIComponent(param[k])));
+	}
+	audio.src = `${getAudioUrl}?${fd.join('&')}`;
+	// audio.src = 'https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-hello-uniapp/2cc220e0-c27a-11ea-9dfb-6da8e309e0d8.mp3'
+	console.log('音频链接',fd.join('&'))
+	// console.log('https://tsn.baidu.com/text2audio')
+
+	if (returnAudio) {
+		audio.onEnded(() => {
+			console.log('音频播放结束');
+			console.log('销毁音频实例');
+			audio.destroy(); //销毁音频实例
+			audio = null;
+		})
+		audio.onError((e) => {
+			if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function')
+				audioCallback.onError(e);
+			console.log('音频播放错误: ' + JSON.stringify(e));
+			console.log('销毁音频实例');
+			audio.destroy(); //销毁音频实例
+			audio = null;
+		})
+		audio.onPause(function() {
+			console.log('end');
+			audio.destroy()
+		})
+		return audio;
+	}
+	console.log(audio);
+	audio.onPlay(() => {
+		console.log('音频播放开始');
+		if (audioCallback && audioCallback.onPlay && typeof(audioCallback.onPlay) == 'function') {
+			audioCallback.onPlay();
+		}
+	})
+	audio.onPause(() => {
+		if (audioCallback && audioCallback.onPause && typeof(audioCallback.onPause) == 'function') {
+			audioCallback.onPause();
+		}
+	})
+	audio.onWaiting(() => {
+		if (audioCallback && audioCallback.onWaiting && typeof(audioCallback.onWaiting) == 'function') {
+			audioCallback.onWaiting();
+		}
+	})
+	audio.onStop(() => {
+		if (audioCallback && audioCallback.onStop && typeof(audioCallback.onStop) == 'function') {
+			audioCallback.onStop();
+		}
+	})
+	audio.onTimeUpdate(() => {
+		if (audioCallback && audioCallback.onTimeUpdate && typeof(audioCallback.onTimeUpdate) == 'function') {
+			audioCallback.onTimeUpdate();
+		}
+	})
+	audio.onSeeking(() => {
+		if (audioCallback && audioCallback.onSeeking && typeof(audioCallback.onSeeking) == 'function') {
+			audioCallback.onSeeking();
+		}
+	})
+	audio.onSeeked(() => {
+		if (audioCallback && audioCallback.onSeeked && typeof(audioCallback.onSeeked) == 'function') {
+			audioCallback.onSeeked();
+		}
+	})
+	audio.onEnded(() => {
+		console.log('音频播放结束');
+		console.log('销毁音频实例');
+		audio.destroy(); //销毁音频实例
+		audio = null;
+		// 清除播报列表对象数据
+		if (audioCallback && audioCallback.onEnded && typeof(audioCallback.onEnded) == 'function') {
+			audioCallback.onEnded();
+		}
+		if (lineUp !== false) {
+			// 删除已经播放对象
+			audioTeam.splice(0, 1);
+			if (audioTeam.length > 0) {
+				console.log('队列中');
+				openVoiceFc(audioTeam[0]);
+			} else {
+				console.log('队列为零');
+				audioStartSwitch = false;
+			}
+		}
+	})
+	audio.onError((e) => {
+		if (audioCallback && audioCallback.onError && typeof(audioCallback.onError) == 'function') audioCallback
+			.onError(e);
+		console.log('音频播放错误: ' + JSON.stringify(e));
+		console.log('销毁音频实例');
+		audio.destroy(); //销毁音频实例
+		audio = null;
+	})
+	audio.play();
 }