1

components/cwg-custom-footer.vue

@@ -49,18 +49,19 @@ const linkList = [
     // display: grid;
     // grid-template-columns: 1fr;
     padding: px2rpx(40) 0 px2rpx(24) 0;
-
+    margin-top: px2rpx(24);
     border-top: 1px solid var(--bs-border-color);
 
     .footer-description {
         .desc-block {
             .desc-text {
                 margin-bottom: px2rpx(8);
+                line-height: px2rpx(20);
             }
 
             .desc-link {
                 display: inline !important;
-                color: #0066cc !important;
+                color: #cf1322 !important;
                 text-decoration: underline !important;
 
                 :deep(uni-view) {
@@ -83,7 +84,7 @@ const linkList = [
             line-height: px2rpx(20);
             font-size: px2rpx(12);
             letter-spacing: px2rpx(0.5);
-            color: #0066cc;
+            color: #cf1322;
             text-decoration: underline;
             cursor: pointer;
 

components/cwg-page-wrapper.vue

@@ -36,6 +36,7 @@
             </view>
           </transition>
           <cwg-custom-footer v-if=!pageTitle />
+          <cwg-footer-link v-if=!pageTitle />
         </view>
       </view>
       <cwg-match-media :max-width="991">
@@ -47,7 +48,10 @@
       </cwg-match-media>
       <view :style="{ height: isTabBarPage ? '60px' : '0px' }" />
     </view>
-    <cwg-footer-link />
+    <cwg-match-media :min-width="991" v-if="!isLoginPage">
+      <cwg-footer-link />
+    </cwg-match-media>
+
   </view>
 </template>
 
@@ -385,7 +389,7 @@ onShow(() => {
   box-sizing: border-box;
 
   @media screen and (max-width: 768px) {
-    height: calc(100vh - (126px + var(--status-bar-height)));
+    height: calc(100vh - (56px + var(--status-bar-height)));
   }
 
   .content-info {
@@ -393,7 +397,7 @@ onShow(() => {
     overflow: auto;
 
     @media screen and (max-width: 768px) {
-      height: calc(100vh - (126px + var(--status-bar-height)));
+      height: calc(100vh - (56px + var(--status-bar-height)));
     }
   }
 
@@ -443,7 +447,7 @@ onShow(() => {
   min-height: calc(100vh - (110px + var(--status-bar-height)));
 
   @media screen and (max-width: 768px) {
-    min-height: calc(100vh - (126px + var(--status-bar-height)));
+    min-height: calc(100vh - (56px + var(--status-bar-height)));
   }
 }
 

components/cwg-pc-header.vue

@@ -1,13 +1,15 @@
 <template>
-	<uni-nav-bar :leftWidth="0" :rightWidth="0" :statusBar="true" :fixed="true" :height="55"
-		:backgroundColor="props.backgrounds || '#fff'" :border="false">
-		<view class="cwg-pc-header">
+	<uni-nav-bar :leftWidth="0" :rightWidth="0" :statusBar="true" :fixed="true" :height="55" :border="false">
+		<view class="cwg-pc-header bg-body">
 			<div class="left">
-				<cwg-icon :name="!sidebarVisible ? 'crm-bars-staggered' : 'cwg-close'" color="#141d22"
+				<cwg-icon :name="!sidebarVisible ? 'crm-bars-staggered' : 'cwg-close'" color="#97A1C0"
 					@click="openLeftDrawer" />
 			</div>
 			<div class="left">
-				<image class="left-img" src="/static/images/logo-full.svg" mode="widthFix" alt="logo" />
+				<image class="left-img" v-if="!isDark" src="/static/images/vu/logo-full.svg" mode="widthFix" alt="logo"
+					@click="openLeftDrawer" />
+				<image class="left-img" v-else src="/static/images/vu/logo-full-white.svg" mode="widthFix" alt="logo"
+					@click="openLeftDrawer" />
 			</div>
 			<div class="right">
 				<cwg-system />
@@ -20,6 +22,10 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
+import useGlobalStore from '@/stores/use-global-store'
+const globalStore = useGlobalStore()
+const isDark = computed(() => globalStore.theme === 'dark')
 const props = defineProps({
 	sidebarVisible: {
 		type: Boolean,

components/cwg-sidebar.vue

@@ -3,12 +3,12 @@
     <view class="wallet-widget">
       <view class="wallet-header" :class="{ 'header-bottom': isWalletOpen }" @click="isWalletOpen = !isWalletOpen">
         <view v-if="mode == 'follow'" class="wallet-header-left">
-          <cwg-icon name="crm-payment" :size="16" color="#141d22" />
+          <cwg-icon name="crm-payment" :size="16" color="#97A1C0" />
           <text>{{ t('Documentary.console.item14') }}</text>
           <text class="wallet-header-text">{{ followBalance }} USD</text>
         </view>
         <view v-else class="wallet-header-left">
-          <cwg-icon name="crm-payment" :size="16" color="#141d22" />
+          <cwg-icon name="crm-payment" :size="16" color="#97A1C0" />
           <text>{{ t(mode === 'customer' ? 'wallet.item5' : 'news_add_field.Label.Balance') }}</text>
           <text class="wallet-header-text">{{ mode === 'customer' ? formattedBalance : ibBalance }} USD</text>
         </view>
@@ -20,7 +20,7 @@
       <view class="wallet-body" v-if="isWalletOpen">
         <view class="wallet-body-header">
           <text class="drawer-title">隐藏余额</text>
-          <switch :checked="!isShow" @change="toggleShow" color="#6c8595"
+          <switch :checked="!isShow" @change="toggleShow" color="#97A1C0"
             style="transform:scale(0.7); margin-right: -10px;" />
         </view>
 
@@ -340,7 +340,6 @@ onUnmounted(() => {
 
     .wallet-body {
       padding: px2rpx(12);
-      background: #ffffff;
 
       .wallet-body-header {
         display: flex;

pages/customer/components/AccountCardDesktop.vue

@@ -142,17 +142,17 @@ const closeFunctionOpen = (code) => {
 // 圆形按钮数据
 const circleButtons = ref([
     { key: 'trade', label: 'Shop.Index.Transaction', icon: 'crm-trade', action: 'trade', needDemo: false, primary: true, disabled: false, color: '#fff' },
-    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1'), color: '#fff' },
-    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2'), color: '#fff' },
-    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#fff' }
+    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1'), color: '#282b44' },
+    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2'), color: '#282b44' },
+    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#282b44' }
 ])
 
 // 普通按钮数据
 const actionButtons = computed(() => [
     { key: 'trade', label: 'Shop.Index.Transaction', icon: 'crm-trade', color: '#fff', primary: true, action: 'trade', needDemo: false, disabled: false },
-    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', color: '#fff', primary: false, action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1') },
-    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', color: '#fff', primary: false, action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2') },
-    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', color: '#fff', primary: false, action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')) }
+    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', color: '#282b44', primary: false, action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1') },
+    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', color: '#282b44', primary: false, action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2') },
+    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', color: '#282b44', primary: false, action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')) }
 ])
 const fieldList = ref([
     { label: t('Custom.PaymentHistory.AccountType'), key: 'nickname', copyable: false },

pages/customer/components/AccountCardMobile.vue

@@ -114,9 +114,9 @@ const closeFunctionOpen = (code) => {
 // 圆形按钮数据
 const circleButtons = ref([
     { key: 'trade', label: 'Shop.Index.Transaction', icon: 'crm-trade', action: 'trade', needDemo: false, primary: true, disabled: false, color: '#fff' },
-    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1'), color: '#fff' },
-    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2'), color: '#fff' },
-    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#fff' }
+    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1'), color: '#282b44' },
+    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2'), color: '#282b44' },
+    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#282b44' }
 ])
 
 const fieldList = ref([

pages/customer/components/AccountList.vue

@@ -30,7 +30,7 @@
                 @change-password="handleChangePassword" />
         </view>
         <view class="table-loading-mask">
-            <uni-loading v-if="loading" />
+            <uni-loading  />
         </view>
         <cwg-empty-state v-if="!loading && accounts.length == 0" />
         <DeleteAccountDialogs ref="deleteAccountDialogRef" v-model:visible="deleteAccountDialogVisible" />

uni_modules/uni-loading/components/uni-loading/loading2.vue

@@ -1,5 +1,5 @@
 <template>
-	 <view class="container loading2">
+	 <view class="container1 loading2">
 		<view class="shape shape1"></view>
 		<view class="shape shape2"></view>
 		<view class="shape shape3"></view>
@@ -19,43 +19,43 @@
 </script>
 
 <style scoped="true">
-.container {
+.container1 {
   width: 30px;
   height: 30px;
   position: relative;
 }
 
-.container.loading2 {
+.container1.loading2 {
   -webkit-transform: rotate(10deg);
           transform: rotate(10deg);
 }
-.container.loading2 .shape {
+.container1.loading2 .shape {
   border-radius: 5px;
 }
-.container.loading2{
+.container1.loading2{
   -webkit-animation: rotation 1s infinite;
           animation: rotation 1s infinite;
 }
 
-.container .shape {
+.container1 .shape {
   position: absolute;
   width: 10px;
   height: 10px;
   border-radius: 1px;
 }
-.container .shape.shape1 {
+.container1 .shape.shape1 {
   left: 0;
   background-color: #1890FF;
 }
-.container .shape.shape2 {
+.container1 .shape.shape2 {
   right: 0;
   background-color: #91CB74;
 }
-.container .shape.shape3 {
+.container1 .shape.shape3 {
   bottom: 0;
   background-color: #FAC858;
 }
-.container .shape.shape4 {
+.container1 .shape.shape4 {
   bottom: 0;
   right: 0;
   background-color: #EE6666;

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue

@@ -1,11 +1,10 @@
 <template>
 	<view class="uni-navbar" :class="{ 'uni-dark': dark, 'uni-nvue-fixed': fixed }">
 		<view class="uni-navbar__content"
-			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
-			:style="{ 'background': themeBgColor }" :b="themeBgColor">
+			:class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }">
 			<status-bar v-if="statusBar" />
 			<view
-				:style="{ color: themeColor, background: themeBgColor, height: navbarHeight, width: showMenuButtonWidth ? navWidth + 'px' : '100%' }"
+				:style="{ color: themeColor, height: navbarHeight, width: showMenuButtonWidth ? navWidth + 'px' : '100%' }"
 				class="uni-navbar__header">
 				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
 					:style="{ width: leftIconWidth }">

windows/top-window.vue

@@ -1,10 +1,10 @@
 <template>
   <header class="cwg-pc-header bg-body" :class="{ 'dark': isDark }">
     <div class="left">
-      <image class="left-img" src="/static/images/vu/logo.png" mode="widthFix" alt="logo" @click="openLeftDrawer" />
-      <image class="left-img1" v-if="!isDark" src="/static/images/vu/logo-text-dark.png" mode="widthFix" alt="logo" @click="openLeftDrawer" />
-      <image class="left-img1" v-else src="/static/images/vu/logo-text-white.png" mode="widthFix" alt="logo" @click="openLeftDrawer" />
-
+      <image class="left-img" v-if="!isDark" src="/static/images/vu/logo-full.svg" mode="widthFix" alt="logo"
+        @click="openLeftDrawer" />
+      <image class="left-img" v-else src="/static/images/vu/logo-full-white.svg" mode="widthFix" alt="logo"
+        @click="openLeftDrawer" />
     </div>
     <div class="right" v-if="visible">
       <cwg-payment />
@@ -79,12 +79,7 @@ const props = defineProps({
 }
 
 .left-img {
-  width: px2rpx(40);
-}
-.left-img1 {
-  display: block;
-  margin-left: 12px;
-  width: px2rpx(80);
+  width: px2rpx(120);
 }
 
 .avatar .img {