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

activity/cutprice/detail.vue

@@ -47,7 +47,8 @@
           </view>
         </view>
         <view class="part-bottom-sty">
-          <view class="time_sty">
+			<view :class="Info.can_buy_now==2?'time_fon_sty_reason1':'time_fon_sty_reason2'" >{{Info.cannot_buy_now_reason}}</view>
+          <view  class="time_sty">
             <view class="time_fon_sty">
               {{ __("活动时间仅剩") }}
             </view>
@@ -126,9 +127,11 @@
                 Info.order_id == ''
               "
             >
-              <view class="immediately_btn" @click="goshop"></view>
+			 <!-- <view class="" @click="goshop">还差xx</view> -->
+              <view class="immediately_btn" v-if="Info.can_buy_now==1" @click="goshop"></view>
               <view
-                class="help_cut_btn"
+                :class="Info.can_buy_now === 2 ? 'help_cut_btn2' : 'help_cut_btn'"
+				style=""
                 v-if="Info.activity_state == 1"
                 @click="shareBox"
               ></view>
@@ -178,7 +181,7 @@
               <!-- <button open-type="share" class="button1" style="margin:40rpx 0 0 0" @click='shareBox'>{{__('找人帮砍')}}</button>  -->
               <!-- 找人帮砍 -->
               <button
-                class="help_cut_btn_1"
+                :class="help_cut_btn_1"
                 v-if="Info.activity_state == 1"
                 @click="shareBox"
               ></button>
@@ -270,6 +273,20 @@
               </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="['msk']" @tap="back" v-if="showImg">
@@ -988,6 +1005,14 @@ export default {
   margin-left: 65rpx;
   font-weight: bold;
 }
+.time_fon_sty_reason1 {
+  margin-left: 70px;
+  font-weight: bold;
+}
+.time_fon_sty_reason2 {
+  margin-left: 100px;
+  font-weight: bold;
+}
 
 .remaining_time {
   font-size: 45rpx;
@@ -1160,7 +1185,6 @@ export default {
 }
 
 .cut_down_sty {
-  margin-bottom: 10rpx;
   justify-content: space-between;
   display: flex;
   font-size: 28rpx;
@@ -1187,6 +1211,15 @@ export default {
   background-size: 100% 100%;
   -moz-background-size: 100% 100%;
 }
+.help_cut_btn2 {
+  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-repeat: no-repeat;
+  background-size: 100% 100%;
+  -moz-background-size: 100% 100%;
+}
 
 .cut_pri_sty {
   position: absolute;