提交

pages/component/commonComponents/selectGoods.vue

@@ -1,8 +1,12 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
-  <view class="container commonPageBox commonDetailPage" style="height: auto !important;padding-bottom: 0 !important;">
+<template>
+  <page-meta
+    :page-font-size="$baseFontSize() + 'px'"
+    :root-font-size="$baseFontSize() + 'px'"
+  ></page-meta>
+  <view
+    class="container commonPageBox commonDetailPage"
+    style="height: auto !important; padding-bottom: 0 !important"
+  >
     <u-popup :show="show" mode="bottom" @close="close" class="popup_box">
       <view class="popup_top">
         <!-- @click="previewImage(selectGoodsData.productImages)" -->
@@ -17,52 +21,48 @@
       </view>
 
       <view :class="`common_radius_box  goods_box popup_content`">
-        <view class="title title_box"
+        <view class="title title_box">
+          <text
+            v-if="
+              selectGoodsData.isVipPrice == 1 &&
+              selectGoodsData.vipPrice != 0 &&
+              selectGoodsData.vipPrice != null
+            "
           >
-
+            <text style="color: #e97512; font-weight: bold"
+              >￥{{ selectGoodsData.vipPrice.toFixed(2) }}</text
+            >
+            <text style="color: #fa2d12; font-size: 12px; margin-left: 4px"
+              >VIP到手价</text
+            >
+            <!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
+          </text>
 
           <text
-              v-if="
-                selectGoodsData.isVipPrice == 1 &&
-                selectGoodsData.vipPrice != 0 &&
-                selectGoodsData.vipPrice != null
-              "
+            v-else-if="
+              selectGoodsData.activityPrice && selectGoodsData.activityPrice > 0
+            "
+          >
+            <text style="color: #e97512; font-weight: bold"
+              >￥{{ selectGoodsData.activityPrice.toFixed(2) }}</text
             >
-              <text style="color: #e97512; font-weight: bold"
-                >￥{{ selectGoodsData.vipPrice.toFixed(2) }}</text
-              >
-              <text style="color: #fa2d12; font-size: 12px; margin-left: 4px"
-                >VIP到手价</text
-              >
-              <!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
-            </text>
+            <text style="color: #613804; font-size: 12px; margin-left: 4px"
+              >活动价</text
+            >
+            <!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
+          </text>
 
-            <text
-              v-else-if="
-                selectGoodsData.activityPrice &&
-                selectGoodsData.activityPrice > 0
-              "
-            >
-              <text style="color: #e97512; font-weight: bold"
-                >￥{{ selectGoodsData.activityPrice.toFixed(2) }}</text
-              >
-              <text style="color: #613804; font-size: 12px; margin-left: 4px"
-                >活动价</text
-              >
-              <!-- <text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(selectGoodsData.price).toFixed(2)}}</text> -->
-            </text>
-
-            <text v-else style="color: #e97512; font-weight: bold">
-              ￥{{ Number(selectGoodsData.price).toFixed(2) }}</text
-            >
+          <text v-else style="color: #e97512; font-weight: bold">
+            ￥{{ Number(selectGoodsData.price).toFixed(2) }}</text
+          >
           <u-icon
             name="close"
             color="#333"
             size="18"
             @click="close"
             style="display: inline-block"
-          ></u-icon
-        ></view>
+          ></u-icon>
+        </view>
         <view class="title title_list"
           ><text>商品列表（{{ goodsList.length }}）</text></view
         >
@@ -126,6 +126,7 @@
                     >VIP优惠</text
                   >
                 </view>
+              </view>
             </view>
 
             <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
@@ -146,8 +147,8 @@
           <text @click="handleClickGoBuy">立即购买</text>
         </view>-->
       </view>
-    </u-popup></view
-  >
+    </u-popup>
+  </view>
 </template>
 
 <script>
@@ -213,7 +214,7 @@ export default {
 `;
       }
     },
-   
+
     // 放大图片
     previewImage(url) {
       console.log(url);
@@ -255,7 +256,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '@/style/mixin.scss';
+@import "@/style/mixin.scss";
+
 .goods_item {
   overflow: hidden;
   display: flex;
@@ -266,12 +268,14 @@ export default {
   border: 2rpx solid #fff;
   border-radius: 10rpx;
 }
+
 .title {
   box-sizing: border-box;
   // font-weight: bold;
   margin-bottom: 40rpx;
   padding-left: 20rpx;
 }
+
 .image_box {
   width: 70rpx;
   height: 70rpx;
@@ -283,6 +287,7 @@ export default {
   width: 100%;
   height: 100%;
 }
+
 .goods_info {
   width: calc(100%);
   // padding: 10rpx 20rpx;
@@ -292,36 +297,45 @@ export default {
   align-items: center;
   justify-content: space-between;
   float: left;
+
   .name {
     font-size: 26rpx;
     // font-weight: 600;
     color: #333;
   }
+
   .price {
     font-size: 26rpx;
     color: #aaa;
   }
 }
+
 .isSelectGoods {
   color: $themeColor !important;
+
   .name {
     color: $themeColor !important;
   }
+
   .price {
     color: $themeColor !important;
   }
+
   border: 2rpx solid $themeColor;
   border-radius: 10rpx;
 }
+
 /deep/.list_item {
   // border-bottom: none;
   padding: 10rpx 0 !important;
   padding-right: 0 !important;
 }
+
 .goods_image {
   width: 100%;
   height: 100%;
 }
+
 .curriulum_box {
   margin-top: 20rpx;
   width: 100%;
@@ -369,25 +383,30 @@ export default {
     }
   }
 }
+
 .popup_box {
   padding-top: 30rpx;
 
   background-color: transparent;
+
   .popup_top {
     display: flex;
     align-items: center;
     color: #fff;
     margin-bottom: 20rpx;
     padding: 0 20rpx;
+
     .title {
       margin-bottom: 0;
       font-size: 30rpx;
       font-weight: 600;
     }
   }
+
   .popup_content {
     padding-bottom: 140rpx;
   }
+
   /deep/.list_item {
     // border-bottom: none;
 
@@ -403,17 +422,21 @@ export default {
     // margin: 0 auto;
   }
 }
+
 /deep/.u-popup__content {
   background-color: transparent !important;
 }
+
 /deep/.u-popup__content__close {
   color: #fff !important;
 }
+
 .title_box {
   display: flex;
   align-items: center;
   justify-content: space-between;
   padding-left: 0;
+
   .title_price {
     color: #ef1224;
     font-size: 40rpx;