فهرست منبع

Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

panhui 4 سال پیش
والد
کامیت
e9ac3dc1f0
5فایلهای تغییر یافته به همراه9 افزوده شده و 8 حذف شده
  1. 2 1
      src/styles/app.less
  2. 2 2
      src/styles/font.less
  3. 1 1
      src/views/Discover.vue
  4. 1 1
      src/views/Mine.vue
  5. 3 3
      src/views/product/Detail.vue

+ 2 - 1
src/styles/app.less

@@ -202,7 +202,8 @@ input:-webkit-autofill {
 }
 
 .page-detail img {
-    width: 100%;
+    width: 100% !important;
+    height: auto !important;
 }
 
 .filter-bg {

+ 2 - 2
src/styles/font.less

@@ -5,12 +5,12 @@
 
 @font-face {
   font-family: 'OSP';
-  src: url(https://zhirongip.oss-cn-hangzhou.aliyuncs.com/fonts/OSP-DIN.ttf);
+  src: url(https://cdn.raex.vip/font/OSP-DIN.ttf);
 }
 
 @font-face {
   font-family: 'DIN';
-  src: url(https://zhirongip.oss-cn-hangzhou.aliyuncs.com/fonts/OSP-DIN.ttf);
+  src: url(https://cdn.raex.vip/font/OSP-DIN.ttf);
 }
 @font-face {
   font-family: 'SourceHanSans-Medium';

+ 1 - 1
src/views/Discover.vue

@@ -104,7 +104,7 @@
         <div class="box">
             <page-title title="更多藏品" :isLink="false"></page-title>
             <van-list
-                style="padding-bottom: 100px;"
+                style="padding-bottom: 100px"
                 class="box-list"
                 v-model:loading="loading"
                 :finished="finished"

+ 1 - 1
src/views/Mine.vue

@@ -22,7 +22,7 @@
                     />
                     <div class="text">
                         <div class="text1">
-                            <span class="van-ellipsis" style="max-width: 120px;">{{ userInfo.nickname }}</span>
+                            <span class="van-ellipsis" style="max-width: 120px">{{ userInfo.nickname }}</span>
 
                             <img
                                 @click="$router.push('/verifiedSuc')"

+ 3 - 3
src/views/product/Detail.vue

@@ -268,13 +268,13 @@
                             <van-button @click="vipAssignment" class="vip" type="danger" block round>
                                 vip通道
                             </van-button>
-                            <van-button style="font-size: 12px;" class="no-btn" v-if="info.vipQuota < 1" block round>
+                            <van-button style="font-size: 12px" class="no-btn" v-if="info.vipQuota < 1" block round>
                                 名额为空
                             </van-button>
                             <van-button @click="share" v-else type="primary" block round>邀请获取 </van-button>
                         </div>
                         <van-button
-                            style="font-size: 12px;"
+                            style="font-size: 12px"
                             class="no-btn"
                             v-if="info.vipQuota < 1 || assignments.length >= assignment"
                             block
@@ -288,7 +288,7 @@
                     <template v-else-if="assignment && isSale && info.timeDelay">
                         <van-button class="no-btn" block round>
                             <div class="appoint">
-                                <span style="font-size: 12px;">任务完成,即将抢购</span>
+                                <span style="font-size: 12px">任务完成,即将抢购</span>
                                 <span>{{ saleTime }}</span>
                             </div>
                         </van-button>