Merge branch 'main' of https://git.gpxscs.cn/front/java-mall-app

activity/cutprice/detail.vue

@@ -286,22 +286,61 @@
               </view>
             </scroll-view>
           </view>
-          <!-- 		  <view style="display:flex; flex-direction: column;  justify-content:center;align-items: center;">
-		  <view>活动规则</view>
-		  <textarea name="" id="" cols="30" rows="10">
-		  砍价时间：顾客发起活动后需要在规定时间内完成砍价，超过时间则砍价失败。一般建议时间为24小时。 
-		  1
-		  砍价次数：顾客需要让朋友帮忙砍价的次数，通常每人只能帮砍一次。 
-		  2
-		  参与方式：用户可以通过商城砍价列表选择产品，或通过好友分享的链接参与砍价活动。 
-		  1
-		  砍价成功：当产品价格砍至系统设置的最低价时，砍价成功，顾客需支付相应金额购买产品。 
-		  1
-		  
-		  这些规则有助于商家和顾客更好地参与砍价活动。</textarea>
-		</view> -->
         </view>
       </view>
+	  
+	  <view class="mask" v-if="showMask && !showImg">
+	    
+	    <text class="mask-close" @tap="maskClose">✕</text>
+		<text class="mask-text-wrap sign">恭喜你!</text>
+		<text class="mask-text-wrap">获得一次摇骰子机会</text>
+		<view class='yaotouzi'>
+			
+	      <image
+	        class="mask-img"
+	        src="/static/images/cutPrice/zero.png"
+	        mode="widthFix"
+			v-if="tossResult==0"
+	      />
+	      <image
+	        class="mask-img"
+	        src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/store/1002812/20251224/47536b007dca4d9cb99fbca0b19afea3.gif"
+	        mode="widthFix"
+			v-if="maskImg&&tossResult==1"
+	      />
+	      <image
+	        class="mask-img"
+	        src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/store/1002812/20251224/a9d08ced8fd4434da79146913658c46f.gif"
+	        mode="widthFix"
+			v-if="maskImg&&tossResult==2"
+	      />
+	      <image
+	        class="mask-img"
+	        src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/store/1002812/20251224/208c19fe992c4514b7de91c130cc7a16.gif"
+	        mode="widthFix"
+			v-if="maskImg&&tossResult==3"
+	      />
+	      <image
+	        class="mask-img"
+	        src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/store/1002812/20251224/3d64d3479cb444daa046a58447ec3d58.gif"
+	        mode="widthFix"
+			v-if="maskImg&&tossResult==4"
+	      />
+	      <image
+	        class="mask-img"
+	        src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/store/1002812/20251224/1b7f93ffa1544059ad3ce51d6b039618.gif"
+	        mode="widthFix"
+			v-if="maskImg&&tossResult==5"
+	      />
+	      <image
+	        class="mask-img"
+	        src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/store/1002812/20251224/3ca2ef1b9d9749f6bffc9d4c91268e17.gif"
+	        mode="widthFix"
+			v-if="maskImg&&tossResult==6"
+	      />
+	    <button @tap='showMaskImg' class="breath-btn">点我开始翻倍</button>
+		</view>
+	  </view>
       <view :class="['msk']" @tap="back" v-if="showImg">
         <view class="msk_box">
           <navigator
@@ -309,7 +348,7 @@
             @tap.stop="goToStore"
           >
             <image
-              src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/cut-price-animation.png"
+              src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/cut-price-animation.png "
               style="width: 100%"
               mode="widthFix"
             ></image>
@@ -366,10 +405,14 @@ export default {
       hours: "",
       show: false,
       showImg: false,
+	    showMask: false,   // 遮罩层
       showPrice: false,
+	    maskImg:false,
+      tossResult:0,
       isCut: true,
       imgPath: "",
       user_nickname: "",
+	  lottery_num:0,
       mid: 0,
       uid: 0,
       pid: 0,
@@ -404,7 +447,7 @@ export default {
       shareData: {
         shareText: "澜驰商城系统，支持原生App、微信小程序，邀请你一起体验！",
         shareTitle: "澜驰商城系统，支持原生App、微信小程序，邀请你一起体验！",
-        href: "https://www.suteshop.com",
+        href: "https://www.suteshop.com ",
         image: "",
       },
       showLoginPopup: false,
@@ -531,6 +574,7 @@ export default {
             that.setData({
               Info: data,
               ac_id: data.ac_id,
+			  lottery_num:data.lottery_num,
               width: 100 * parseFloat(data.CutPricePercent).toFixed(2),
             });
             // that.getTime();
@@ -557,13 +601,41 @@ export default {
         },
       });
     },
+	showMaskImg(){
+		this.maskImg=true;
+		const that = this
+		$.request({
+			url: this.Config.URL.user.dolookTurnCutPrice,
+			data: {ac_id:this.ac_id},
+			success:function(data, status, msg, code){
+				if(status==200){
+					that.tossResult=data.point
+					setTimeout(()=>{
+						wx.showModal({
+						title: '幸运骰子',
+						content: `恭喜你,摇到了${data.point}点,幸运暴击${data.point}倍,砍了${data.achPrice}元`,
+						showCancel: false,
+						confirmText: '确定',
+						success(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									that.maskClose()
+								}
+							}
+						});
+					},2000)
+				}
+				console.log("hhhhhh",that.tossResult)
+			}
+		})
+	},
 	  // 头像区域点击事件
 	  handleAvatarClick() {
 	    const that = this;
 	    if (!that.hasLogin) {
 	      that.showLoginPopup = true; // 显示登录弹窗
 	      return;
-	    }
+	    } 
 	  },
     handleLoginSuccess() {
       const that = this;
@@ -578,7 +650,7 @@ export default {
 
         //直接更新页面数据（头像、昵称），确保实时渲染
         that.setData({
-          imgPath: user_info.user_avatar || "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/default-avatar.png",
+          imgPath: user_info.user_avatar || "https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/default-avatar.png ",
           user_nickname: user_info.user_nickname || "亲爱的用户",
           participantId: user_info.user_id || "",
           uid: user_info.user_id || that.uid,
@@ -744,8 +816,27 @@ export default {
             that.setData({
               money: data.ach_price,
               ac_id: data.ac_id,
-              showImg: true,
+              // showMask: true,
             });
+			wx.showModal({
+			title: '恭喜',
+			content: `成功砍了${data.ach_price_pre}元`,
+			showCancel: false,
+			confirmText: '确定',
+			success(res) {
+					if (res.confirm&&that.lottery_num>0) {
+						setTimeout(()=>{
+							that.setData({
+								showMask: true,
+							})
+						},200)
+					}else if(res.confirm&&that.lottery_num==0){
+						that.setData({
+							showImg: true
+						})
+					}
+				}
+			});
             that.GetVendorCutPriceEventDetail();
             that.GetOtherCutPriceActivityList();
           } else {
@@ -753,6 +844,9 @@ export default {
           }
         },
       });
+      // that.setData({
+      //   showMask: true,
+      // });
     },
     onShareAppMessage: function () {
       // #ifdef MP-WEIXIN
@@ -1027,6 +1121,10 @@ export default {
         urls: [this.PageQRCodeInfo.Path],
       });
     },
+	maskClose:function() {
+	  this.showMask = false;
+	  this.showImg  = true;   // 关闭遮罩后立刻展示动画图
+	}
   },
 };
 </script>
@@ -1061,7 +1159,7 @@ export default {
 
 .bargin {
   width: 750rpx;
-  // background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/whole-background-start.png);
+  // background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/whole-background-start.png );
   // background-repeat: no-repeat;
   // background-size: 100% 100%;
   // -moz-background-size: 100% 100%;
@@ -1117,7 +1215,7 @@ export default {
   margin-top: -2rpx;
   width: 750rpx;
   height: 1200rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/background-bottom-one.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/background-bottom-one.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1204,7 +1302,7 @@ export default {
 .top-sty {
   width: 750rpx;
   height: 950rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/background-start-top.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/background-start-top.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1234,7 +1332,7 @@ export default {
 .goods-sty {
   margin-top: -2rpx;
   width: 750rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/background-goods.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/background-goods.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1324,7 +1422,7 @@ export default {
   height: 70rpx;
   line-height: 70rpx;
   text-align: center;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/begin-bargaining-button.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/begin-bargaining-button.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1342,7 +1440,7 @@ export default {
   margin-left: 180rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/sell-immediately.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/sell-immediately.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1352,7 +1450,7 @@ export default {
   margin-left: 100rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1361,7 +1459,7 @@ export default {
   margin-left: 300rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1372,7 +1470,7 @@ export default {
   right: 180rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut-price.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut-price.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1383,7 +1481,7 @@ export default {
   left: 180rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/sell-immediately.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/sell-immediately.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1394,7 +1492,7 @@ export default {
   left: 180rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/i-want.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/i-want.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1405,7 +1503,7 @@ export default {
   right: 180rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/help-cut.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1416,7 +1514,7 @@ export default {
   left: 300rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/again-stroll.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/again-stroll.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1427,7 +1525,7 @@ export default {
   left: 300rpx;
   height: 60rpx;
   width: 150rpx;
-  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/sell-immediately.png);
+  background-image: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/cutprice-1/sell-immediately.png );
   background-repeat: no-repeat;
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
@@ -1679,4 +1777,117 @@ export default {
   font-size: 28rpx;
   padding-top: 10rpx;
 }
-</style>
+.mask {
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.75);
+  display: flex;
+  align-items: center; 
+  justify-content: center; 
+  z-index: 999;
+  flex-direction: column; 
+  padding: 40rpx 0; 
+}
+.mask-box{
+  width:602rpx;
+  background:#fff;
+  border-radius:16rpx;
+  padding:40rpx;
+  position:relative;
+}
+.mask-close{
+  position:absolute;
+  right:20rpx;
+  top:20rpx;
+  font-size:40rpx;
+  color:#fff;
+}
+.mask-text-wrap {
+  font-size: 40rpx;
+  color: #fff; 
+  text-align: center;
+  margin-bottom: 30rpx; 
+  font-weight: bold;
+  line-height: 44rpx;
+}
+.mask-text{
+  position:absolute;
+  top:0rpx;
+  font-size:30rpx;
+  color:#999;
+}
+.mask-img{
+  width:60%;
+  height:auto;
+  margin:0 auto;
+}
+.mask-btn{
+  width:100%;
+  height:80rpx;
+  line-height:80rpx;
+  background:#ff6803;
+  color:#fff;
+  font-size:32rpx;
+  border-radius:12rpx;
+}
+.yaotouzi{
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+}
+
+
+/* 呼吸按钮核心样式 */
+.breath-btn {
+  /* 基础按钮样式（可根据你的UI调整） */
+  width: 280rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  background: #ff6803;
+  color: #fff;
+  font-size: 32rpx;
+  border-radius: 40rpx;
+  border: none;
+  outline: none;
+  
+  /* 呼吸动画核心 */
+  animation: breath 2s ease-in-out infinite; /* 2秒一个周期，匀速循环 */
+}
+
+/* 定义呼吸动画（缩放） */
+@keyframes breath {
+  0% {
+    transform: scale(1); /* 原始大小 */
+  }
+  50% {
+    transform: scale(1.1); /* 放大10%（可调整幅度） */
+  }
+  100% {
+    transform: scale(1); /* 回到原始大小 */
+  }
+}
+
+/* 可选：点击时的按压效果，增强交互 */
+.breath-btn:active {
+  transform: scale(0.95); /* 点击时稍微缩小 */
+  animation: none; /* 点击时暂停呼吸动画 */
+}
+/* 温馨提示文本样式（核心） */
+.warm-tip {
+  font-size: 30rpx; 
+  color: #fff; 
+  text-align: center;
+  margin-top: 10rpx; 
+  line-height: 32rpx;
+  padding: 0 20rpx; 
+}
+.sign{
+	font-size: 70rpx;
+	color: red; 
+	text-align: center;
+}
+</style>

config/config.js

@@ -586,6 +586,7 @@ export default {
 			"listsCutPriceActivity": iu + "?ctl=Activity&met=listsCutPriceActivity&typ=json",
 			// "getCutPriceActivity": iu + "?ctl=Activity&met=getCutPriceActivity&typ=json",
 			"getCutPriceActivity": ip + "shop/userActivity/getCutPriceActivity",
+			"dolookTurnCutPrice":ip+"shop/userActivity/dolookTurnCutPrice",
 			// "listsCutPriceHistory": iu + "?ctl=Activity&met=listsCutPriceHistory&typ=json",
 			"listsCutPriceHistory": ip + "shop/userActivity/listsCutPriceHistory",
 			"listsGroupbookingActivity": iu + "?ctl=Activity&met=listsGroupbookingActivity&typ=json",

member/order/detail.vue

@@ -165,7 +165,7 @@
             >再来一单</view
           >
           <view
-            class="order-btn order-btn-zailai"
+            class="order-btn order-btn-queren"
             :data-on="OrderInfo.order_id"
             v-if="
               OrderInfo.kind_id == 1201 &&
@@ -178,7 +178,7 @@
           <view
             :data-on="OrderInfo.order_id"
             class="order-btn order-btn-quxiao"
-            v-if="OrderInfo.is_deny_return"
+            v-if="!OrderInfo.if_buyer_cancel"
             @click="cancelOrder"
           >
             {{ __("取消订单") }}</view
@@ -2454,6 +2454,8 @@ export default {
 
       .order-btn-zailai {
         margin-right: 0;
+        background-color: #ff4f28;
+	      color:white;
       }
 
       .order-btn-disabled {
@@ -2866,4 +2868,8 @@ export default {
 	background-color: #ff4f28;
 	color:white;
 }
+.order-btn-queren{
+	background-color: #ff4f28;
+	color:white;
+}
 </style>

unpackage/dist/build/mp-weixin/components/u-parse/components/wxParseImg.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/components/verify-code/imgcode.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/index/member.json

@@ -6,7 +6,6 @@
     "u-parse": "/components/u-parse/u-parse",
     "guess-you-like": "/components/product-list",
     "uni-badge": "/components/uni-badge",
-    "diy": "/components/themes/diy",
     "login-popup": "/components/loginPopup"
   }
 }