声音

ghsApp/src/mixins/product.js

@@ -398,7 +398,13 @@ export default {
 			}
 
 			if(this.checkStock){
-				if ((Number(item.bigCount) * item.ratio + Number(item.smallCount)) > (Number(item.bigNum) * item.ratio + Number(item.smallNum))) {
+				let currentCount = Number(item.bigCount) * item.ratio + Number(item.smallCount)
+				currentCount = currentCount.toFixed(2)
+				let currentNum = Number(item.bigNum) * item.ratio + Number(item.smallNum)
+				currentNum = currentNum.toFixed(2)
+				console.log(currentCount+' '+currentNum)
+				if (Number(currentCount) > Number(currentNum)) {
+					console.log('库存不足。。。')
 					this.$util.noStockRemind()
 					this.$msg("库存不足哦")
 					return
@@ -451,10 +457,8 @@ export default {
 			}
 			unitName = current.bigUnit
 			unitPrice = current.bigPrice
-			//this.$util.hitVoice()
 			let num = this.calc == 'add' ? 1 : -1
-			let params = {...current,unitName:unitName,userPrice:unitPrice,bigCount:num}
-			console.log(params)
+			let params = {...current,unitName:unitName,userPrice:unitPrice,bigCount:num,smallCount:0}
 			this.replaceItemFn(params,1,'add',1)
 		},
 		//大小单位切换

ghsApp/src/utils/util.js

@@ -117,18 +117,9 @@ export async function getCheckLogin() {
 		// #ifdef H5
 		if (isWxBrowser()) {
 			let option = JSON.parse(uni.getStorageSync("currentQuery")) || {};
-			console.log("option", option);
-			// console.log('option', getMiniAppUrl(option, true))
-			// return false
 			location.href = `${CONSTANT.hostUrl}/auth/prepare?url=${encodeURIComponent(
 				getMiniAppUrl(option, true)
 			)}`;
-		} else {
-			// uni.showToast({
-			// 	title: '请用微信浏览器打开！',
-			// 	icon: 'none',
-			// 	mask: true
-			// })
 		}
 		// #endif
 		// #ifndef H5
@@ -235,7 +226,6 @@ export const $formatDate = (num, fmt = "YYYY-MM-DD HH:mm", all) => {
  * @parmas item.type 为跳转调用的函数 1为navigateTo, 2为redirectTo 关闭当前页面，跳转到应用内的某个页面 3为reLaunch 关闭所有页面，打开到应用内的某个页面  4为switchTab
  */
 export const pageTo = item => {
-	console.log(item,'itemitem')
 	if (isNumber(item)) {
 		uni.navigateBack({
 			delta: item
@@ -262,7 +252,6 @@ export const pageTo = item => {
 				url: allUrl
 			});
 		} else if (item.type == 4) {
-			console.log("switchTab", item.query);
 			uni.setStorageSync("switchTabQuery", item.query);
 			uni.switchTab({
 				url: item.url
@@ -301,6 +290,7 @@ export const noStockRemind = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
 	innerAudioContext.autoplay = false
 	innerAudioContext.src = "/static/noStock.mp3"
+	innerAudioContext.volume = 1
 	innerAudioContext.onPlay()
 	innerAudioContext.onError()
 	innerAudioContext.onPause(function() {

ghsPad/src/utils/util.js

@@ -298,41 +298,29 @@ export const callUp = (mobile) =>{
 
 //没有库存时的语音播放 shish
 export const noStockRemind = () =>{
-	//没有库存声音提醒
-	const innerAudioContext = uni.createInnerAudioContext();
-	innerAudioContext.autoplay = true;
-	innerAudioContext.src = `${CONSTANT.imgUrl}/voice/noStock.mp3`;
-	innerAudioContext.onPlay(() => {
-		//console.log('开始播放');
-	});
-	innerAudioContext.onError((res) => {
-		//console.log(res.errMsg);
-		//console.log(res.errCode);
-	});
+	const innerAudioContext = uni.createInnerAudioContext()
+	innerAudioContext.autoplay = false
+	innerAudioContext.volume = 1
+	innerAudioContext.src = "/static/noStock.mp3"
+	innerAudioContext.onPlay()
+	innerAudioContext.onError()
 	innerAudioContext.onPause(function() {
-		//console.log('end');
-		innerAudioContext.destroy();
+		innerAudioContext.destroy()
 	})
+	innerAudioContext.play()
 }
 
 //点击声效 shish
 export const hitRemind = () =>{
-	//没有库存声音提醒
-	const innerAudioContext = uni.createInnerAudioContext();
-	innerAudioContext.autoplay = true;
-	innerAudioContext.src = `${CONSTANT.imgUrl}/hit.mp3`;
-	innerAudioContext.volume = 0.5
-	innerAudioContext.onPlay(() => {
-		//console.log('开始播放');
-	});
-	innerAudioContext.onError((res) => {
-		//console.log(res.errMsg);
-		//console.log(res.errCode);
-	});
+	const innerAudioContext = uni.createInnerAudioContext()
+	innerAudioContext.autoplay = false
+	innerAudioContext.src = "/static/hit.mp3"
+	innerAudioContext.onPlay()
+	innerAudioContext.onError()
 	innerAudioContext.onPause(function() {
-		//console.log('end');
-		innerAudioContext.destroy();
+		innerAudioContext.destroy()
 	})
+	innerAudioContext.play()
 }
 
 //去重 姜枫 2021.05.05

hdApp/src/utils/util.js

@@ -413,6 +413,7 @@ export const noStockRemind = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
 	innerAudioContext.autoplay = false
 	innerAudioContext.src = "/static/noStock.mp3"
+	innerAudioContext.volume = 1
 	innerAudioContext.onPlay()
 	innerAudioContext.onError()
 	innerAudioContext.onPause(function() {

hdPad/src/utils/util.js

@@ -299,6 +299,7 @@ export const callUp = (mobile) =>{
 export const noStockRemind = () =>{
 	const innerAudioContext = uni.createInnerAudioContext()
 	innerAudioContext.autoplay = false
+	innerAudioContext.volume = 1
 	innerAudioContext.src = "/static/noStock.mp3"
 	innerAudioContext.onPlay()
 	innerAudioContext.onError()