From f090c5dc63d4a3f4eafd66b4708d1b859ea6717a Mon Sep 17 00:00:00 2001
From: yeweikangxx123 <317226901@qq.com>
Date: Wed, 2 Apr 2025 23:10:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(cl-tabbar):=20=E4=BF=AE=E5=A4=8Duser.skin?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E5=AF=BC=E8=87=B4=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8tab=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cl-tabbar.vue | 135 ++++++++++++---------------------------
 util/i18n/index.js       |   8 +--
 vue.config.js            |   2 +-
 3 files changed, 47 insertions(+), 98 deletions(-)

diff --git a/components/cl-tabbar.vue b/components/cl-tabbar.vue
index f0bdfd4..9be6e1c 100644
--- a/components/cl-tabbar.vue
+++ b/components/cl-tabbar.vue
@@ -6,111 +6,55 @@
 -->
 <template>
   <view>
-    <u-tabbar :value="current?current:0"
-    v-if="user.skin==0"
-              @change="tabbarChange"
-              :fixed="true"
-              :placeholder="false"
-              :border="false"
-              :safeAreaInsetBottom="true"
-              inactiveColor="#666666"
-              activeColor="#333333">
+    <!-- v-if="user.skin == 0" -->
+    <u-tabbar :value="current ? current : 0"  @change="tabbarChange" :fixed="true" :placeholder="false"
+      :border="false" :safeAreaInsetBottom="true" inactiveColor="#666666" activeColor="#333333">
       <u-tabbar-item :text="'首页'">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/one1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/one2.png"></image>
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/one1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/one2.png"></image>
       </u-tabbar-item>
       <u-tabbar-item :text="'站内信'">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/two1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/two2.png"></image>
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/two1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/two2.png"></image>
       </u-tabbar-item>
       <u-tabbar-item :text="'会员专区'">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/five1.jpg"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/five2.jpg"></image>
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/five1.jpg"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/five2.jpg"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="'购物车'"
-                     :badge="shopCarLength">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/three1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/three2.png"></image>
+      <u-tabbar-item :text="'购物车'" :badge="shopCarLength">
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/three1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/three2.png"></image>
       </u-tabbar-item>
-    
+
       <u-tabbar-item :text="'我的'">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/fore1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/fore2.png"></image>
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/fore1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/fore2.png"></image>
       </u-tabbar-item>
     </u-tabbar>
-    <u-tabbar :value="current?current:0"
-    class="greenEd"
-    v-if="user.skin==2"
-              @change="tabbarChange"
-              :fixed="true"
-              :placeholder="false"
-              :border="false"
-              :safeAreaInsetBottom="true"
-              inactiveColor="#666666"
-              activeColor="#333333">
+    <!-- <u-tabbar :value="current ? current : 0" class="greenEd" v-if="user.skin == 2" @change="tabbarChange" :fixed="true"
+      :placeholder="false" :border="false" :safeAreaInsetBottom="true" inactiveColor="#666666" activeColor="#333333">
       <u-tabbar-item :text="'首页'">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/one11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/one11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/one11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/one11.jpg"></image>
       </u-tabbar-item>
       <u-tabbar-item :text="'站内信'">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/two11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/two11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/two11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/two11.jpg"></image>
       </u-tabbar-item>
       <u-tabbar-item :text="'会员专区'">
-        <image class="u-page__item__slot-icon2"
-               slot="active-icon"
-               src="@/static/images/five11.jpg"></image>
-        <image class="u-page__item__slot-icon2"
-               slot="inactive-icon"
-               src="@/static/images/five11.jpg"></image>
+        <image class="u-page__item__slot-icon2" slot="active-icon" src="@/static/images/five11.jpg"></image>
+        <image class="u-page__item__slot-icon2" slot="inactive-icon" src="@/static/images/five11.jpg"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="'购物车'"
-                     :badge="shopCarLength">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/three11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/three11.jpg"></image>
+      <u-tabbar-item :text="'购物车'" :badge="shopCarLength">
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/three11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/three11.jpg"></image>
       </u-tabbar-item>
-    
+
       <u-tabbar-item :text="'我的'">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/fore11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/fore11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/fore11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/fore11.jpg"></image>
       </u-tabbar-item>
-    </u-tabbar>
+    </u-tabbar> -->
   </view>
 </template>
 
@@ -139,7 +83,7 @@ export default {
           text: '购物车',
           path: 'pages/shoppingCar/index',
         },
-       
+
         {
           text: '我的',
           path: 'pages/mine/index',
@@ -148,7 +92,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['shopCarLength','user']),
+    ...mapGetters(['shopCarLength', 'user']),
   },
   methods: {
     tabbarChange(e) {
@@ -165,24 +109,29 @@ export default {
   width: 20px;
   height: 20px;
 }
+
 .u-page__item__slot-icon1 {
   width: 35px;
   height: 35px;
   // margin-bottom: 20px
 }
+
 .u-page__item__slot-icon2 {
   width: 35px;
   height: 35px;
   // margin-bottom: 20px
 }
-.greenEd{
- ::v-deep .u-tabbar__content{
-  background: linear-gradient(to bottom, #fff, #b6fdda);
+
+.greenEd {
+  ::v-deep .u-tabbar__content {
+    background: linear-gradient(to bottom, #fff, #b6fdda);
   }
-  ::v-deep .u-tabbar__content__item-wrapper{
+
+  ::v-deep .u-tabbar__content__item-wrapper {
     height: 80px
   }
-  ::v-deep .u-tabbar-item{
+
+  ::v-deep .u-tabbar-item {
     // margin-bottom: 30px;
   }
 }
diff --git a/util/i18n/index.js b/util/i18n/index.js
index 506f53a..fe1148c 100644
--- a/util/i18n/index.js
+++ b/util/i18n/index.js
@@ -7,8 +7,8 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import zhCn from 'zhCN'
-import enUS from 'enUS'
-import zhTC from 'zhTC'
+// import enUS from 'enUS'
+// import zhTC from 'zhTC'
 // import ruRU from 'ruRU'
 // import frFR from 'frFR'
 
@@ -23,8 +23,8 @@ const i18n = new VueI18n({
 
   messages: {
     'zh-CN': { ...zhCn },
-    'en-US': { ...enUS },
-    'zh-TC': { ...zhTC },
+    // 'en-US': { ...enUS },
+    // 'zh-TC': { ...zhTC },
     // 'ru-RU': { ...ruRU },
     // 'fr-FR': { ...frFR },
     // 'ru-RU': { ...ruRu },
diff --git a/vue.config.js b/vue.config.js
index 2f189af..10e2271 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,7 +10,7 @@ module.exports = {
   configureWebpack: {
     externals: {
       'zhCN': 'zhCN',
-      'enUS': 'enUS',
+      // 'enUS': 'enUS',
       'zhTC': 'zhTC',
       // 'ruRU':'ruRU',
       // 'frFR':'frFR',