321

honey_box/common/common.js

@@ -56,7 +56,7 @@ export default {
 		if (typeof numStr !== 'string') {
 			numStr = String(numStr);
 		}
-		
+
 		if (numStr.includes('.')) {
 			numStr = numStr.replace(/0+$/, ''); // 移除末尾的零
 			if (numStr.endsWith('.')) {
@@ -156,7 +156,7 @@ export default {
 		provider = 'weixin',
 		data
 	}) {
-		console.log('wxdata', data,this)
+		console.log('wxdata', data, this)
 		// #ifdef H5
 		console.log('进入h5支付', data)
 		return new Promise((resolve, reject) => {
@@ -379,10 +379,12 @@ export default {
 			const res = await getDanYeContent(id);
 			if (res.status == 1) {
 				if (res.data) {
-					res.data = res.data.content.replace(
+					if (res.data.content != null) {
-						/\<img/gi,
+						res.data = res.data.content.replace(
-						'<img style="width: 100%;vertical-align: middle;"'
+							/\<img/gi,
-					)
+							'<img style="width: 100%;vertical-align: middle;"'
+						)
+					}
 				}
 				return res;
 			} else {
@@ -453,7 +455,7 @@ export default {
 			default:
 				navigationType = 'navigateTo';
 		}
-		
+
 		// 使用导入的路由方法而不是this.$router
 		return routerNavigateTo(url, query, navigationType)
 			.then(res => {
@@ -480,7 +482,7 @@ export default {
 		if (typeof e === 'number' && !isNaN(e)) {
 			delta = e;
 		}
-		
+
 		// 使用导入的routerNavigateBack而不是this.$router
 		routerNavigateBack(delta)
 			.catch(() => {
@@ -604,11 +606,11 @@ export default {
 		// 解析URL和参数
 		let urlPath = url;
 		let params = {};
-		
+
 		if (url.includes('?')) {
 			const parts = url.split('?');
 			urlPath = parts[0];
-			
+
 			// 解析参数
 			if (parts[1]) {
 				parts[1].split('&').forEach(param => {
@@ -619,7 +621,7 @@ export default {
 				});
 			}
 		}
-		
+
 		// 使用导入的路由方法
 		return routerNavigateTo(urlPath, params);
 	},

honey_box/components/detail-button/detail-button.vue

@@ -5,7 +5,8 @@
       <view class="button-container">
         <!-- 按钮1 (小按钮) - 当有多个按钮显示时才显示 -->
         <view v-if="checkVisible(1) && !onlyButton1Visible" class="btn common_bg column center"
-          :style="{ backgroundImage: `url(${$img1('common/chouBtn1.png')})` }" @click="handleButtonClick(1)">
+          :style="{ backgroundImage: `url(${$img1('common/btn1131.png')})` }" @click="handleButtonClick(1)">
+         <text style="font-size: 24rpx;color: #424240;">冲一发</text> 
         </view>
         <!-- 只显示按钮1的时候，显示这个按钮，上面小的按钮隐藏 -->
         <view v-if="checkVisible(1) && onlyButton1Visible" class="btn common_bg column center"
@@ -15,17 +16,20 @@
 
         <!-- 按钮3 -->
         <view v-if="checkVisible(3)" class="btn common_bg column center"
-          :style="{ backgroundImage: `url(${$img1('common/chouBtn3.png')})` }" @click="handleButtonClick(3)">
+          :style="{ backgroundImage: `url(${$img1('common/btn1131.png')})` }" @click="handleButtonClick(3)">
+           <text style="font-size: 24rpx;color: #424240;">冲三发</text> 
         </view>
 
         <!-- 按钮5 -->
         <view v-if="checkVisible(5)" class="btn common_bg column center"
-          :style="{ backgroundImage: `url(${$img1('common/chouBtn5.png')})` }" @click="handleButtonClick(5)">
+          :style="{ backgroundImage: `url(${$img1('common/btn1131.png')})` }" @click="handleButtonClick(5)">
+           <text style="font-size: 24rpx;color: #424240;">冲五发</text> 
         </view>
 
         <!-- 按钮10 (仅在无限模式显示) -->
         <view v-if="isWuxian && checkVisible(10)" class="btn common_bg column center"
-          :style="{ backgroundImage: `url(${$img1('common/chouBtn10.png')})` }" @click="handleButtonClick(10)">
+          :style="{ backgroundImage: `url(${$img1('common/btn1131.png')})` }" @click="handleButtonClick(10)">
+            <text style="font-size: 24rpx;color: #424240;">冲十发</text> 
         </view>
         <!-- 无限抽 -->
         <!-- <view v-if="isWuxian && checkVisible(-1)" class="btn common_bg column center"

honey_box/components/order-confirm-popup/order-confirm-popup.vue

@@ -56,18 +56,17 @@
 
 							<view class="num">×{{ orderData.goods.prize_num }}</view>
 						</view>
-						<!-- <view class="price-num">
+						<!-- 抽奖动画开关（已隐藏，默认关闭）
+						<view class="price-num">
 							<view class="type">
-								特效开关
+								抽奖动画
 							</view>
 							<view class="num" style="height: 30rpx;">
 								<switch style="transform:scale(0.5);width:35px;height: 30rpx;" :checked="effectSwitch"
 									@change="onEffectSwitch" />
 							</view>
-						</view> -->
-						<view class="type">
-
 						</view>
+						-->
 					</view>
 				</view>
 			</view>

honey_box/pages/shouye/detail.vue

@@ -282,7 +282,7 @@
 				this.couponData = data;
 				this.confirmSubmit([0, this.buyNum]);
 			});
-			this.effectSwitch = uni.getStorageSync('effectSwitch') === 1 || uni.getStorageSync('effectSwitch') === "";
+			this.effectSwitch = uni.getStorageSync('effectSwitch') === 1;
 			// uni.getImageInfo({
 			//   src: this.$img('/static/img/animation.png'),
 			//   success: ({ path }) => {

honey_box/pages/shouye/detail_wuxian.vue

@@ -343,7 +343,7 @@
 				this.couponData = data
 				this.confirmSubmit([0, this.buyNum])
 			})
-			this.effectSwitch = uni.getStorageSync('effectSwitch') === 1 || uni.getStorageSync('effectSwitch') === "";
+			this.effectSwitch = uni.getStorageSync('effectSwitch') === 1;
 			this.$c.getRule(10).then(res => {
 				if (res.status == 1) {
 					this.sendRuleData = res.data