邹能昇 hai 3 meses
pai
achega
9ccaf36312

+ 0 - 0
nova-tourism/styles/font/Noto-sans/NotoSans-Bold-5.ttf → assets/font/Noto-sans/NotoSans-Bold-5.ttf


+ 0 - 0
nova-tourism/styles/font/Noto-sans/NotoSans-BoldItalic-4.ttf → assets/font/Noto-sans/NotoSans-BoldItalic-4.ttf


+ 0 - 0
nova-tourism/styles/font/Noto-sans/NotoSans-Italic-3.ttf → assets/font/Noto-sans/NotoSans-Italic-3.ttf


+ 0 - 0
nova-tourism/styles/font/Noto-sans/NotoSans-Regular-2.ttf → assets/font/Noto-sans/NotoSans-Regular-2.ttf


+ 2 - 2
nova-tourism/components/collect/index.less

@@ -260,12 +260,12 @@
     //选中
     @font-face {
         font-family: 'NotoSans-Bold-5';
-        src: url('../../styles/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
+        src: url('../../../assets/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
     }
     //为选中
     @font-face {
         font-family: 'NotoSans-Regular-2';
-        src: url('../../styles/font/Noto-sans/NotoSans-Regular-2.ttf'); /* 字体文件路径 */
+        src: url('../../../assets/font/Noto-sans/NotoSans-Regular-2.ttf'); /* 字体文件路径 */
     }
     
     .tab-bar {

+ 2 - 2
nova-tourism/components/collect/index.wxml

@@ -4,10 +4,10 @@
     <image class="img2" src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/jc17lo114657420.jpg"></image>
     <view class="tab-bar">
         <view style="margin-left: 66rpx;" class="tab-item {{currentTab == 0? 'active' : ''}}" bindtap="switchTab" data-index="0">
-            <text>云上风物</text>
+            云上风物
         </view>
         <view style="margin-left: 44rpx;" class="tab-item {{currentTab == 1? 'active' : ''}}" bindtap="switchTab" data-index="1">
-            <text>我的收藏</text>
+            我的收藏
         </view>
     </view>
     <view wx:if="{{currentTab == 0}}">

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
nova-tourism/components/collect/index.wxss


+ 5 - 5
nova-tourism/pages/my/my-card/index.less

@@ -4,18 +4,18 @@
     padding-left: 42rpx;
     overflow-y: scroll;
     // font-family: 'NotoSans-Bold-5', sans-serif;
-    font-family: 'Noto Sans SC';
+    font-family: 'NotoSans-Regular-2', sans-serif;
     color: #382E2E;
     font-weight: 400;
         //选中
         @font-face {
             font-family: 'NotoSans-Bold-5';
-            src: url('../../../styles/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
+            src: url('../../../../assets/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
         }
         //为选中
         @font-face {
             font-family: 'NotoSans-Regular-2';
-            src: url('../../../styles/font/Noto-sans/NotoSans-Regular-2.ttf'); /* 字体文件路径 */
+            src: url('../../../../assets/font/Noto-sans/NotoSans-Regular-2.ttf'); /* 字体文件路径 */
         }
         
         .tab-bar {
@@ -96,7 +96,7 @@
                     .num{
                         font-size: 48rpx;
                         color: #F73C2C ;
-                        font-family: 'Noto Sans SC';
+                        font-family: 'NotoSans-Regular-2', sans-serif;
                     }
                     .num-tex{
                         font-size: 24rpx;
@@ -104,7 +104,7 @@
                         margin-bottom: 8rpx;
                         margin-left: 4rpx;
                         font-weight: 500;
-                        font-family: 'Noto Sans SC';
+                        font-family: 'NotoSans-Bold-5', sans-serif;
                     }
                 }  
                 .textbox{

+ 2 - 2
nova-tourism/pages/my/my-card/index.wxml

@@ -3,10 +3,10 @@
 <view class="all" style="height: {{contentHeight}}rpx;">
     <view class="tab-bar">
         <view class="tab-item {{currentTab == 0? 'active' : ''}}" bindtap="switchTab" data-index="0">
-            <text>优惠卷</text>
+            优惠卷
         </view>
         <view style="margin-left: 60rpx;" class="tab-item {{currentTab == 1? 'active' : ''}}" bindtap="switchTab" data-index="1">
-            <text>会员卡</text>
+            会员卡
         </view>
     </view>
     <view wx:if="{{currentTab == 0}}">

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
nova-tourism/pages/my/my-card/index.wxss


+ 2 - 2
nova-tourism/pages/my/my-order/index.less

@@ -20,12 +20,12 @@
     }
     @font-face {
         font-family: 'NotoSans-Bold-5';
-        src: url('../../../styles/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
+        src: url('../../../../assets/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
     }
         //为选中
         @font-face {
             font-family: 'NotoSans-Regular-2';
-            src: url('../../../styles/font/Noto-sans/NotoSans-Regular-2.ttf'); /* 字体文件路径 */
+            src: url('../../../../assets/font/Noto-sans/NotoSans-Regular-2.ttf'); /* 字体文件路径 */
         }
         
     .tab-bar {

+ 3 - 3
nova-tourism/pages/my/my-order/index.wxml

@@ -11,13 +11,13 @@
 
     <view class="tab-bar">
         <view style="margin-left: 56rpx;" class="tab-item {{currentTab == 0? 'active' : ''}}" bindtap="switchTab" data-index="0">
-            <text>处理中</text>
+            处理中
         </view>
         <view style="margin-left: 60rpx;" class="tab-item {{currentTab == 1? 'active' : ''}}" bindtap="switchTab" data-index="1">
-            <text>进行中</text>
+            进行中
         </view>
         <view style="margin-left: 60rpx;" class="tab-item {{currentTab == 2? 'active' : ''}}" bindtap="switchTab" data-index="2">
-            <text>已完成</text>
+            已完成
         </view>
     </view>
     <view wx:if="{{currentTab == 0}}">

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
nova-tourism/pages/my/my-order/index.wxss


+ 2 - 2
nova-tourism/pages/my/my-wallet/index.less

@@ -4,11 +4,11 @@
     padding-left: 20rpx;
     padding-right: 20rpx;
     color: #382E2E;
-    font-family: 'Noto Sans SC';
+    font-family: 'NotoSans-Regular-2', sans-serif;
     font-weight: 400;
     @font-face {
         font-family: 'NotoSans-Bold-5';
-        src: url('../../styles/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
+        src: url('../../../../assets/font/Noto-sans/NotoSans-Bold-5.ttf'); /* 字体文件路径 */
     }
     .textbox{
         width: 100%;

+ 1 - 1
nova-tourism/pages/my/my-wallet/index.wxss

@@ -1 +1 @@
-.all{width:100vw;padding-left:20rpx;padding-right:20rpx;color:#382E2E;font-family:'Noto Sans SC';font-weight:400}@font-face{font-family:'NotoSans-Bold-5';src:url('../../styles/font/Noto-sans/NotoSans-Bold-5.ttf')}.all .textbox{width:100%;margin-bottom:46rpx;display:flex;align-items:center}.all .textbox image{width:56rpx;height:56rpx}.all .textbox .text{font-size:32rpx;margin-left:18rpx}
+.all{width:100vw;padding-left:20rpx;padding-right:20rpx;color:#382E2E;font-family:'NotoSans-Regular-2',sans-serif;font-weight:400}@font-face{font-family:'NotoSans-Bold-5';src:url('../../../../assets/font/Noto-sans/NotoSans-Bold-5.ttf')}.all .textbox{width:100%;margin-bottom:46rpx;display:flex;align-items:center}.all .textbox image{width:56rpx;height:56rpx}.all .textbox .text{font-size:32rpx;margin-left:18rpx}

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio