Merge branch 'master' of http://47.99.76.149:3000/baokemeng/uniAppXCX

pages/drawCard_first/drawCard_first.vue

@@ -9,7 +9,7 @@
         <view class="row">
           <view class="price">
             ￥{{ detail.price }}
-            <span class="text fontPFR">/张明信片</span>
+            <span class="text">/张明信片</span>
           </view>
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 5 })"

pages/drawCard_fullSet/drawCard_fullSet.vue

@@ -9,7 +9,7 @@
         <view class="row">
           <view class="price">
             ￥{{ detail.price }}
-            <span class="text fontPFR">/张明信片</span>
+            <span class="text">/张明信片</span>
           </view>
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 3 })"

pages/drawCard_infinite/drawCard_infinite.vue

@@ -9,7 +9,7 @@
         <view class="row">
           <view class="price">
             ￥{{ detail.price }}
-            <span class="text fontPFR">/张明信片</span>
+            <span class="text">/张明信片</span>
           </view>
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 1 })"
@@ -34,7 +34,7 @@
       <div class="flex items-center" @click="showList">
         <img src="https://file.rongcyl.cn/festatic/bkm/ouking_a.png" class="w-10 h-10" />
         <div class="ml-1">
-          <div class="fontPFSCS" style="font-size: 15px">欧王奖励</div>
+          <div class="bold" style="font-size: 15px">欧王奖励</div>
           <div style="font-size: 12px">{{ ouCount }}届欧王</div>
         </div>
       </div>
@@ -46,7 +46,7 @@
         />
         <img src="https://file.rongcyl.cn/festatic/bkm/x.png" class="w-10 h-10" v-else />
         <div class="ml-1" :style="{ color: detail.subType.includes('111') ? '' : '#a9bcd1' }">
-          <div class="fontPFSCS" style="font-size: 15px">随机掉落</div>
+          <div class="bold" style="font-size: 15px">随机掉落</div>
           <div style="font-size: 12px">未开启</div>
         </div>
       </div>
@@ -58,7 +58,7 @@
         />
         <img src="https://file.rongcyl.cn/festatic/bkm/free.png" class="w-10 h-10" v-else />
         <div class="ml-1" :style="{ color: detail.subType.includes('112') ? '' : '#a9bcd1' }">
-          <div class="fontPFSCS" style="font-size: 15px">随机免单</div>
+          <div class="bold" style="font-size: 15px">随机免单</div>
           <div style="font-size: 12px">未开启</div>
         </div>
       </div>

pages/drawCard_last/drawCard_last.vue

@@ -9,7 +9,7 @@
         <view class="row">
           <view class="price">
             ￥{{ detail.price }}
-            <span class="text fontPFR">/张明信片</span>
+            <span class="text">/张明信片</span>
           </view>
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 5 })"

pages/index2/index.vue

@@ -78,11 +78,11 @@
               创意热销
             </div>
             <div>
-              <span style="font-size: 14px; margin-right: 4px; color: #fc5b20" class="fontPFSCS">999</span>
+              <span style="font-size: 14px; margin-right: 4px; color: #fc5b20" class="bold">999</span>
               <span style="color: #666666">销量</span>
             </div>
           </div>
-          <div style="color: #fc5b20; margin-top: 10px; font-size: 20px" class="fontPFSCS">￥990</div>
+          <div style="color: #fc5b20; margin-top: 10px; font-size: 20px" class="bold">￥990</div>
         </div>
       </div>
       <div class="p">

pages/shoppingMall/shoppingMall.vue

@@ -9,10 +9,10 @@
         class="mx-1 bg-white rounded-lg shadow-md mb-2"
       >
         <img :src="goods.icon" class="rounded-t-lg w-full" style="height: 200px" />
-        <div class="fontPFSCS p-2">{{ goods.name }}</div>
+        <div class="bold p-2">{{ goods.name }}</div>
         <div class="text-right pr-2 mb-1">
           <span style="font-size: 12px">积分：</span>
-          <span class="fontPFSCS text-red-500">{{ goods.integral }}</span>
+          <span class="bold text-red-500">{{ goods.integral }}</span>
         </div>
 
         <!-- <div ></div> -->

static/style.scss

@@ -1,27 +1,7 @@
-@font-face {
-  font-family: 'font1';
-  src: url('https://mall.rongtongh.cn/storage/font/font.ttf');
-}
-@font-face {
-  font-family: 'PingFangSCSemibold';
-  src: url('https://mall.rongtongh.cn/storage/font/PingFangTC-Semibold.ttf');
-}
-@font-face {
-  font-family: 'PingFangRegular';
-  src: url('https://mall.rongtongh.cn/storage/font/PingFang-Regular.ttf');
-}
-.font1 {
-  font-family: 'font1';
-}
-.fontPFSCS {
-  font-family: 'PingFangSCSemibold';
-}
 .bold {
-  font-family: 'PingFangSCSemibold';
-}
-.fontPFR {
-  font-family: 'PingFangRegular';
+  font-size: 600;
 }
+
 page {
   // font-family: 'PingFangRegular';
 }