Merge branch 'main' of https://gitlab.com/tea28/client

src/pages/pay-agreement/index.vue

@@ -30,6 +30,11 @@ export default {
       uni.setNavigationBarTitle({
         title: "兑换协议",
       });
+    }else if(option.type == 6){
+      this.type = 20;
+      uni.setNavigationBarTitle({
+        title: "天天捡漏协议",
+      });
     }
     this.loadData();
   },

src/pages/product/p_details.vue

@@ -71,8 +71,9 @@
                 <checkbox-group class="flex_r flex_ac flex_jc" @change="checkboxChange">
                     <label class="option_box">
                         <checkbox value="1" :checked="checked" color="#2DB389" style="transform: scale(0.7)" />
-                        我已阅读同意<text @tap.stop="getProPage" v-if="type != 5">《购买协议》</text>
-                        <text @tap.stop="getProPage" v-else>《兑换协议》</text>
+                        我已阅读同意<text @tap.stop="getProPage" v-if="(type != 5 && type != 6)">《购买协议》</text>
+                        <text @tap.stop="getProPage" v-else-if="(type == 5)">《兑换协议》</text>
+                        <text @tap.stop="getProPage" v-else-if="(type == 6)">《天天捡漏协议》</text>
                     </label>
                 </checkbox-group>
                 <view class="confim flex_r flex_ac flex_jc" @tap="ToPayPage">确定</view>

src/pages/product/productRetail.vue

@@ -9,12 +9,13 @@
                 <view class="content-view">
                     <view :class="['product-title', 'ellipsis1']">{{ i.goods_name }}</view>
                     <view class="product-price">
-                        <text class="product-price-original"><text class="product-unit">￥</text>{{ i.price }}</text>
                         <text class="product-price-favour">￥{{i.cost_price}}</text>
+                        <text class="product-price-original"><text class="product-unit">￥</text>{{ i.price }}</text>
+                        
                         <!-- <text class="product-tip">{{i.tip}}</text> -->
                     </view>
                     <view class="product-txt" v-if="type != 6">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view>
-                    <view class="product-txt" v-else>每{{i.interval_time}}分钟降价{{i.drop_range * 100}}%</view>
+                    <view class="product-txt" v-else>每<text class="green">{{i.interval_time}}</text> 分钟降价 <text class="green">{{i.drop_range * 100}}%</text> </view>
                 </view>
             </view>
         </view>
@@ -205,6 +206,10 @@ page {
         color: #18bb88;
     }
 
+    .green{
+        color: #18bb88;
+    }
+
     .product-txt {
         font-size: 22rpx;
         color: #787878;