feat:优化

components/cwg-link.vue

@@ -96,6 +96,7 @@ const startDownload = () => {
 
 <style scoped>
 .pdf-link {
+  width: 100%;
   display: inline-block;
   cursor: pointer;
 }

components/cwg-tabel.vue

@@ -880,8 +880,8 @@ defineExpose({
             // 奇数行背景颜色
             &:nth-child(odd) {
               // 暂时用一样的颜色
-                //background-color: var(--bs-light-bg-subtle);
-                background-color: var(--bs-body-bg);
+                background-color: var(--bs-light-bg-subtle);
+                //background-color: var(--bs-body-bg);
             }
 
             // 偶数行背景颜色
@@ -912,7 +912,7 @@ defineExpose({
         }
 
         .uni-table-td {
-            padding: px2rpx(16) px2rpx(5);
+            padding: px2rpx(16) px2rpx(15);
             color: var(--bs-emphasis-color) !important;
             border-bottom: 1px solid var(--bs-light-bg-subtle) !important;
             box-sizing: border-box;

pages/activities/index.vue

@@ -92,7 +92,7 @@
                     <view class="col-12 m-b30" v-if="country == 'CN'">
                         <view class="card card-action action-elevate action-border-primary">
                             <view class="row g-0">
-                                <view class="col-md-4">
+                                <view class="col-md-3">
                                     <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
                                         <image src="/static/images/yue.jpg" alt="" class="img-fluid rounded"
                                             mode="widthFix" />
@@ -135,7 +135,7 @@
                     <view class="col-12 m-b30">
                         <view class="card card-action action-elevate action-border-primary">
                             <view class="row g-0">
-                                <view class="col-md-4">
+                                <view class="col-md-3">
                                     <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
                                         <image src="/static/images/su.png" alt="" class="img-fluid rounded"
                                             mode="widthFix" />
@@ -184,7 +184,7 @@
                     <view class="col-12 m-b30" v-if="tableDataCptFlag">
                         <view class="card card-action action-elevate action-border-primary">
                             <view class="row g-0">
-                                <view class="col-md-4">
+                                <view class="col-md-3">
                                     <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
                                         <image src="/static/images/banner.jpg" alt="" class="img-fluid rounded"
                                             mode="widthFix" />
@@ -230,7 +230,7 @@
                     <view class="col-12 m-b30" v-for="(item, index) in tableDataGive" :key="index + 'give'">
                         <view class="card card-action action-elevate action-border-primary">
                             <view class="row g-0">
-                                <view class="col-md-4" v-if="item.coverUrl">
+                                <view class="col-md-3" v-if="item.coverUrl">
                                     <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
                                         <image :src="imgUrl + item.coverUrl" alt="" class="img-fluid rounded"
                                             mode="widthFix" />
@@ -267,7 +267,7 @@
                     <view class="col-12 m-b30" v-for="(item, index) in tableData" :key="index + 'tttt'">
                         <view class="card card-action action-elevate action-border-primary">
                             <view class="row g-0">
-                                <view class="col-md-4" v-if="item.coverUrl">
+                                <view class="col-md-3" v-if="item.coverUrl">
                                     <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
                                         <image :src="imgUrl + item.coverUrl" alt="" class="img-fluid rounded"
                                             mode="widthFix" />
@@ -2482,6 +2482,10 @@ onReachBottom(() => {
 <style scoped lang="scss">
 @import "@/uni.scss";
 
+.card{
+  color: var(--cwg-gray-color);
+}
+
 // 弹窗样式优化
 .dia-content {
     .content {

pages/analytics/components/List.vue

@@ -40,12 +40,12 @@
             <view class="col-md-9 py-3 d-flex flex-column">
               <view class="card-body px-3 py-2">
                 <!-- <a href="#" class="badge badge-sm bg-danger mb-1">Trading</a> -->
-                <h4>
-                  <span class="text-2xs text-body"><i class="icon-calendar text-primary"></i> {{
+                <h5>
+                  <span class="text-2xs text-body p-text"><i class="icon-calendar text-primary"></i> {{
                     formatDate(item.deliveryTime) }}</span><br>
                   <a href="#" class="text-dark">{{ item.title }}</a>
-                </h4>
-                <p>{{ item.subTitle }}</p>
+                </h5>
+                <p class="p-text">{{ item.subTitle }}</p>
               </view>
             </view>
           </view>
@@ -162,4 +162,9 @@ defineExpose({ load, loadMore })
 
 <style lang="scss" scoped>
 @import "@/uni.scss";
+.p-text{
+  font-size: px2rpx(14);
+  line-height: px2rpx(16);
+  color: var(--cwg-gray-color)!important;
+}
 </style>

pages/common/download.vue

@@ -15,11 +15,11 @@
                             <view class="nav nav-pills nav-fill card-header-pills">
                                 <view class="nav-item">
                                     <view class="nav-link cursor-pointer" :class="{ 'active': activeName == 'MT4' }"
-                                        @click="activeName = 'MT4'">MT-4</view>
+                                        @click="activeName = 'MT4'">MetaTrader 4</view>
                                 </view>
                                 <view class="nav-item">
                                     <view class="nav-link cursor-pointer" :class="{ 'active': activeName == 'MT5' }"
-                                        @click="activeName = 'MT5'">MT-5</view>
+                                        @click="activeName = 'MT5'">MetaTrader 5</view>
                                 </view>
                             </view>
                         </view>
@@ -32,6 +32,10 @@
                                             <p class="mb-5 lh-sm" v-t="'Downloadpage.item3'" />
                                         </view>
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="download"
+                                                    :url="config.Host80 + '/mt/cwgmarketssvgltd4setup.exe'"
+                                                    downloadName="cwgmarketssvgltd4setup.exe">
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -49,20 +53,26 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item4'" />
                                                             </h4>
                                                             <p v-t="'Downloadpage.item5'" />
-                                                            <cwg-link type="download"
-                                                                :url="config.Host80 + '/mt/cwgmarketssvgltd4setup.exe'"
-                                                                downloadName="cwgmarketssvgltd4setup.exe">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
 
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="download" class="download-card"
+                                                    :url="config.Host80 + '/mt/mt4.zip'"
+                                                    downloadName="mt4.zip">
+<!--                                            <view class="btn btn-danger waves-effect waves-light">-->
+<!--                                              <i class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}-->
+<!--                                            </view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -80,21 +90,22 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item4-1'" />
                                                             </h4>
                                                             <p v-t="'Downloadpage.item5'" />
-                                                            <cwg-link type="download" class="download-card"
-                                                                :url="config.Host80 + '/mt/mt4.zip'"
-                                                                downloadName="mt4.zip">
-                                                                <view class="btn btn-danger waves-effect waves-light">
-                                                                    <i class="fi fi-rr-download"></i> {{
-                                                                        t('Downloadpage.item6-1') }}
-                                                                </view>
-                                                            </cwg-link>
+
 
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="download" class="download-card"
+                                                    :url="config.Host80 + '/mt/MetaTrader4.pkg'"
+                                                    downloadName="MetaTrader4.pkg">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -111,21 +122,21 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item6'" />
                                                             </h4>
                                                             <p v-t="'Downloadpage.item5'" />
-                                                            <cwg-link type="download" class="download-card"
-                                                                :url="config.Host80 + '/mt/MetaTrader4.pkg'"
-                                                                downloadName="MetaTrader4.pkg">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
 
                                         <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item38'" />
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="html" target="_blank"
+                                                    :url="'https://www.' + config.host + '.com/' + locale + '/vu-mt4-web-trading/web'">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> 开始交易</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -142,18 +153,21 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item40'" />
                                                             </h4>
                                                             <p>PC and macOS</p>
-                                                            <cwg-link type="html" target="_blank"
-                                                                :url="'https://www.' + config.host + '.com/' + locale + '/vu-mt4-web-trading/web'">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> 开始交易</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item7'" />
                                         <view class="col-lg-6 mb-5">
+                                          <cwg-link type="download" class="download-card" :url="mt41"
+                                                    downloadName="MetaTrader4.abb">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-6">
@@ -170,19 +184,21 @@
                                                                 <view class="text-dark">Google Play (Android)</view>
                                                             </h4>
                                                             <p>CWG MT4</p>
-                                                            <cwg-link type="download" class="download-card" :url="mt41"
-                                                                downloadName="MetaTrader4.abb">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
 
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-6 mb-5">
+                                          <cwg-link type="download" class="download-card" :url="mt42"
+                                                    downloadName="MetaTrader4.apk">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-6">
@@ -200,18 +216,20 @@
                                                                 <view class="text-dark">MetaTrader .Apk</view>
                                                             </h4>
                                                             <p>CWG MT4</p>
-                                                            <cwg-link type="download" class="download-card" :url="mt42"
-                                                                downloadName="MetaTrader4.apk">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-6 mb-5">
+                                          <cwg-link type="download" class="download-card" :url="mt43"
+                                                    downloadName="MetaTrader4.app">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-6">
@@ -229,16 +247,12 @@
                                                                 <view class="text-dark">App Store (IOS)</view>
                                                             </h4>
                                                             <p>CWG MT4</p>
-                                                            <cwg-link type="download" class="download-card" :url="mt43"
-                                                                downloadName="MetaTrader4.app">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                     </view>
                                 </view>
@@ -249,6 +263,13 @@
                                             <p class="mb-5 lh-sm" v-t="'Downloadpage.item3'" />
                                         </view>
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="download" class="download-card"
+                                                    :url="config.Host80 + '/mt/cwgmarketssvg5setup.exe'"
+                                                    downloadName="cwgmarketssvg5setup.exe">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -266,20 +287,23 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item4'" />
                                                             </h4>
                                                             <p v-t="'Downloadpage.item5'" />
-                                                            <cwg-link type="download" class="download-card"
-                                                                :url="config.Host80 + '/mt/cwgmarketssvg5setup.exe'"
-                                                                downloadName="cwgmarketssvg5setup.exe">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
 
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="download" class="download-card"
+                                                    :url="config.Host80 + '/mt/mt5.zip'"
+                                                    downloadName="mt5.zip">
+<!--                                            <view class="btn btn-danger waves-effect waves-light">-->
+<!--                                              <i class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}-->
+<!--                                            </view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -297,21 +321,22 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item4-1'" />
                                                             </h4>
                                                             <p v-t="'Downloadpage.item5'" />
-                                                            <cwg-link type="download" class="download-card"
-                                                                :url="config.Host80 + '/mt/mt5.zip'"
-                                                                downloadName="mt5.zip">
-                                                                <view class="btn btn-danger waves-effect waves-light">
-                                                                    <i class="fi fi-rr-download"></i> {{
-                                                                        t('Downloadpage.item6-1') }}
-                                                                </view>
-                                                            </cwg-link>
+
 
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="download" class="download-card"
+                                                    :url="config.Host80 + '/mt/MetaTrader5.pkg'"
+                                                    downloadName="MetaTrader5.pkg">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -328,21 +353,22 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item6'" />
                                                             </h4>
                                                             <p v-t="'Downloadpage.item5'" />
-                                                            <cwg-link type="download" class="download-card"
-                                                                :url="config.Host80 + '/mt/MetaTrader5.pkg'"
-                                                                downloadName="MetaTrader5.pkg">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
 
                                         <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item39'" />
                                         <view class="col-lg-4 mb-5">
+                                          <cwg-link type="html"
+                                                    class="download-card download-card-web" target="_blank"
+                                                    :url="'https://www.' + config.host + '.com/' + locale + '/mt5/web'">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> 开始交易</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-4">
@@ -359,19 +385,21 @@
                                                                 <view class="text-dark" v-t="'Downloadpage.item40'" />
                                                             </h4>
                                                             <p>PC and macOS</p>
-                                                            <cwg-link type="html"
-                                                                class="download-card download-card-web" target="_blank"
-                                                                :url="'https://www.' + config.host + '.com/' + locale + '/mt5/web'">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> 开始交易</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item13'" />
                                         <view class="col-lg-6 mb-5">
+                                          <cwg-link type="download" class="download-card" :url="mt51"
+                                                    downloadName="MetaTrader5.abb">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-6">
@@ -388,19 +416,21 @@
                                                                 <view class="text-dark">Google Play (Android)</view>
                                                             </h4>
                                                             <p>CWG MT5</p>
-                                                            <cwg-link type="download" class="download-card" :url="mt51"
-                                                                downloadName="MetaTrader5.abb">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
 
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-6 mb-5">
+                                          <cwg-link type="download" class="download-card" :url="mt52"
+                                                    downloadName="MetaTrader5.apk">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-6">
@@ -418,18 +448,20 @@
                                                                 <view class="text-dark">MetaTrader .Apk</view>
                                                             </h4>
                                                             <p>CWG MT5</p>
-                                                            <cwg-link type="download" class="download-card" :url="mt52"
-                                                                downloadName="MetaTrader5.apk">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                         <view class="col-lg-6 mb-5">
+                                          <cwg-link type="download" class="download-card" :url="mt53"
+                                                    downloadName="MetaTrader5.app">
+<!--                                            <view class="btn btn-danger waves-effect waves-light"><i-->
+<!--                                              class="fi fi-rr-download"></i> {{-->
+<!--                                                t('Downloadpage.item6-1') }}</view>-->
+
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
                                                     <view class="col-md-6">
@@ -447,16 +479,12 @@
                                                                 <view class="text-dark">App Store (IOS)</view>
                                                             </h4>
                                                             <p>CWG MT5</p>
-                                                            <cwg-link type="download" class="download-card" :url="mt53"
-                                                                downloadName="MetaTrader5.app">
-                                                                <view class="btn btn-danger waves-effect waves-light"><i
-                                                                        class="fi fi-rr-download"></i> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
-                                                            </cwg-link>
+
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
+                                          </cwg-link>
                                         </view>
                                     </view>
                                 </view>

pages/customer/components/PaymentMethodsList.vue

@@ -1,15 +1,27 @@
 <template>
   <view class="row">
-    <view class="col-lg-3 col-sm-12" v-for="item in list" :key="item.id" :class="{ disabled: item.disabled }">
-      <view class="card">
-        <view class="card-header d-flex justify-content-between align-items-center">
-          <h4 class="card-title mb-0">{{ item.name }}</h4>
-        </view>
+    <uni-collapse  accordion v-model="accordionVal" @change="change">
+      <uni-collapse-item class="" v-for="item in list" :key="item.id" >
+        <template v-slot:title>
+          <view class="item-title">
+            <view>{{item.name}}</view>
+            <button @click="handleClick(item)" class="btn btn-info item-btn waves-effect waves-light">
+<!--              <i class="fi fi-rs-check"></i> -->
+              <text v-t="'Btn.item13'" /></button>
+          </view>
+
+        </template>
+
+    <view class="col-lg-3 col-sm-12 "  :class="{ disabled: item.disabled }">
+      <view class="">
+<!--        <view class="card-header d-flex justify-content-between align-items-center">-->
+<!--          <h4 class="card-title mb-0">{{ item.name }}</h4>-->
+<!--        </view>-->
         <view class="card-body">
           <image v-if="item.icon" class="img-fluid mb-3 square-box" :src="imgUrl + item.icon" mode="aspectFit" />
           <!-- <image src="/static/images/vu/pay-3.jpg" class="img-fluid mb-3" mode="widthFix" /> -->
-          <view v-if="item.payTypeTags && item.payTypeTags.length > 0" class="pay-box">
-            <view class="carousel-box">
+          <view v-if="item.payTypeTags && item.payTypeTags.length > 0" class="pay-box img-bg">
+            <view class="carousel-box ">
               <!-- 超过3个：轮播 -->
               <view v-if="item.payTypeTags.length > 3" class="carousel-track carousel-animate">
                 <view v-for="(icon, index) in item.payTypeTags" :key="index" class="pay-icon-container">
@@ -28,11 +40,11 @@
               </view>
             </view>
           </view>
-          <view class="mb-3"> <span class="mb-1" v-t="'Label.ProcessingTime'" />
-            <p class="text-dark fw-semibold mt-1 mb-0">{{ item.fundingTime || '--' }}</p>
+          <view class="mb-3"> <span class="mb-2" v-t="'Label.ProcessingTime'" />
+            <p class="text-dark fw-semibold mt-2 mb-0">{{ item.fundingTime || '--' }}</p>
           </view>
           <view class="mb-3"> <span class="mb-2" v-t="'Label.Fee'" />
-            <p class="text-dark fw-semibold mt-1 mb-0">
+            <p class="text-dark fw-semibold mt-2 mb-0">
               <text v-if="item.feeType == 1">{{ item.free != null ? item.free + '%' : '-' }}</text>
               <text v-else-if="item.feeType == 2">${{ item.feeAmount != null ? item.feeAmount : '0'
                 }}</text>
@@ -40,13 +52,14 @@
             </p>
           </view>
           <view class="mb-3"> <span class="mb-1" v-t="'vu.item8'" />
-            <p class="text-dark fw-semibold mt-1 mb-0">{{ item.minAmount }}-{{ item.maxAmount }} {{ item.currency }}</p>
+            <p class="text-dark fw-semibold mt-2 mb-0">{{ item.minAmount }}-{{ item.maxAmount }} {{ item.currency }}</p>
           </view>
-          <button @click="handleClick(item)" class="btn btn-dark w-100 waves-effect waves-light"><i
-              class="fi fi-rs-check"></i> <text v-t="'Btn.item13'" /></button>
+
         </view>
       </view>
     </view>
+      </uni-collapse-item>
+    </uni-collapse>
   </view>
   <!-- <view class="payment-list">
     <view v-for="item in list" :key="item.id" class="payment-card" :class="{ disabled: item.disabled }"
@@ -101,7 +114,7 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue'
+import { defineProps, defineEmits,ref } from 'vue'
 import Config from '@/config/index'
 const { Code, Host05, Host80 } = Config
 const imgUrl = Host05
@@ -113,6 +126,12 @@ const props = defineProps({
   }
 })
 
+const accordionVal = ref()
+const change = (val)=>{
+
+  console.log(val)
+}
+
 // 定义事件，点击卡片时触发
 const emit = defineEmits(['select'])
 
@@ -126,6 +145,23 @@ const handleClick = (item) => {
 <style lang="scss" scoped>
 @import "@/uni.scss";
 
+.item-title{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: px2rpx(5) 0;
+  font-size: px2rpx(16);
+  color: var(--bs-emphasis-color);
+}
+.item-btn{
+  width: px2rpx(120);
+  margin: 0;
+  height: px2rpx(28);
+  line-height: px2rpx(28);
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
 .row {
   display: flex;
   flex-wrap: wrap;
@@ -353,4 +389,10 @@ const handleClick = (item) => {
     }
   }
 }
+.img-bg{
+  padding: 0 px2rpx(10);
+  border-radius: px2rpx(10);
+  box-sizing: border-box;
+  background-color: rgba(243, 244, 246, 0.6);
+}
 </style>

pages/customer/deposit-select.vue

@@ -12,7 +12,7 @@
                 <view class="col-lg-12">
                     <view class="clearfix">
                         <view class="card">
-                            <view class="card-header">
+                            <view class="card-header pb-0">
                                 <view class="col-12 mb-5">
                                     <view
                                         class="d-flex flex-wrap gap-3 align-items-center justify-content-between mb-3">
@@ -33,7 +33,7 @@
                                         :tabs="tabsConfig" />
                                 </template>
                             </view>
-                            <view class="card-body" v-if="step2 && currentTableData.length > 0">
+                            <view class="card-body pt-0" v-if="step2 && currentTableData.length > 0">
                                 <view class="tab-content">
                                     <view>
                                         <PaymentMethodsList :list="currentTableData" @select="isShowStep3" />
@@ -2054,6 +2054,9 @@ watch(() => params.agree6, (newVal) => {
 
 <style lang="scss" scoped>
 @import "@/uni.scss";
+.card-header{
+  border: none;
+}
 
 .custom-deposit {
 

pages/customer/deposit.vue

@@ -45,11 +45,11 @@
                                                 :options="creditCardOptions" :placeholder="t('placeholder.choose')"
                                                 @change="selectCode" />
                                         </uni-forms-item>
-                                        <h6 class="add-back mb-3">
+                                        <h5 class="add-back mb-3">
                                             <text>{{ t('PersonalManagement.Label.addCreditCard') }}</text>
                                             <text class="add-btn crm-cursor" @click="openAddBankCard">{{
                                                 t('Custom.Withdraw.addBank1') }}</text>
-                                        </h6>
+                                        </h5>
                                     </view>
                                     <!-- 银行选择（如有） -->
                                     <view class="col-lg-6" v-if="isStep3 && bankOptions.length">
@@ -325,7 +325,7 @@
                 </view>
                 <view class="col-lg-4">
                     <view class="tips" v-if="(introduce.introduce || introduce.enIntroduce)">
-                        <view>
+                        <view class="card card-body">
                             <cwg-rich-text class="attention"
                                 :nodes="isZh ? introduce.introduce : introduce.enIntroduce" />
                         </view>
@@ -1864,7 +1864,7 @@ function formatChannels(data) {
         list.forEach(item => {
             result.push({
                 ...item,
-                text: item.name,
+                text: `${item.name}`,
                 value: item.code
             })
         })
@@ -2491,6 +2491,9 @@ watch(() => params.agree6, (newVal) => {
     display: flex;
     align-items: center;
     gap: px2rpx(8);
+  uni-text{
+    font-weight: 600;
+  }
 
     :deep(.uni-tooltip) {
         display: flex;

pages/customer/transfer.vue

@@ -39,7 +39,7 @@
                                                 <uni-easyinput v-model="form.amount"
                                                     :placeholder="t('placeholder.input')" @blur="validateAmount" />
                                             </uni-forms-item>
-                                            <view class="btn btn-dark waves-effect waves-light" v-t="'State.All'"
+                                            <view class="btn btn-gray waves-effect waves-light" v-t="'State.All'"
                                                 @click="setAllAmount"></view>
                                         </view>
                                     </view>

pages/customer/withdrawal.vue

@@ -307,7 +307,7 @@
         </view>
         <view class="col-lg-4">
           <view class="tips" v-if="(introduce.introduce || introduce.enIntroduce)">
-            <view>
+            <view class="card card-body">
               <cwg-rich-text class="attention" :nodes="isZh ? introduce.introduce : introduce.enIntroduce" />
             </view>
           </view>
@@ -2181,6 +2181,9 @@ watch(() => form.amount, (newVal) => {
 
 <style lang="scss" scoped>
 @import "@/uni.scss";
+.card{
+  color: var(--bs-emphasis-color);
+}
 
 .custom-withdraw {
   width: px2rpx(566);

pages/mine/components/BankInfoTab.vue

@@ -39,16 +39,16 @@
                           <view class="action-btn bg-secondary btn-dark" v-if="item.authStatus == 0"
                                 type="primary" @click="openCardDialog(item.id, item)"
                                 v-t="'PersonalManagement.CardVerify.Title'" />
-                          <view class="action-btn bg-secondary btn-dark"
+                          <view class="action-btn btn-gray"
                                 v-if="!editingId && item.authStatus !== 1" @tap="startEdit(item)"
                                 v-t="'Btn.Editor'" />
                           <template v-if="editingId === item.id">
-                            <view class="action-btn bg-secondary btn-dark" @tap="saveBank(item)"
+                            <view class="action-btn  btn-gray" @tap="saveBank(item)"
                                   v-t="'Btn.Save'" />
-                            <view class="action-btn bg-secondary btn-dark" @tap="cancelEdit()"
+                            <view class="action-btn  btn-gray" @tap="cancelEdit()"
                                   v-t="'Btn.Cancel'" />
                           </template>
-                          <view class="action-btn bg-secondary btn-dark" @tap="confirmDelete(item)"
+                          <view class="action-btn  btn-gray" @tap="confirmDelete(item)"
                                 v-t="'Btn.Delete'" />
                         </view>
                       </view>
@@ -83,7 +83,7 @@
                         </view>
                       </uni-forms-item>
                     </uni-col>
-                    <uni-col :xs="24">
+                    <uni-col :xs="24" class="mt-3">
                       <uni-forms-item class="checkbox-item">
                         <uni-data-checkbox :disabled="editingId !== item.id" v-model="item.defaultBank1" multiple
                                            :localdata="hobbys" />
@@ -114,16 +114,16 @@
                     </uni-col>
                     <uni-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
                       <view class="bank-actions">
-                        <view class="action-btn bg-secondary btn-dark"
+                        <view class="action-btn  btn-gray"
                               v-if="!editingId && item.authStatus !== 1" @tap="startEdit(item)"
                               v-t="'Btn.Editor'" />
                         <template v-if="editingId === item.id">
-                          <view class="action-btn bg-secondary btn-dark" @tap="saveBank(item)"
+                          <view class="action-btn  btn-gray" @tap="saveBank(item)"
                                 v-t="'Btn.Save'" />
-                          <view class="action-btn bg-secondary btn-dark" @tap="cancelEdit()"
+                          <view class="action-btn  btn-gray" @tap="cancelEdit()"
                                 v-t="'Btn.Cancel'" />
                         </template>
-                        <view class="action-btn delete btn-dark" @tap="confirmDelete(item)"
+                        <view class="action-btn btn-gray" @tap="confirmDelete(item)"
                               v-t="'Btn.Delete'" />
                       </view>
                     </uni-col>
@@ -175,7 +175,7 @@
                           @update:modelValue="(val) => handleFileUpdate(val, item, 'bankFront')" />
                       </uni-forms-item>
                     </uni-col>
-                    <uni-col :xs="24">
+                    <uni-col :xs="24" class="mt-3">
                       <uni-forms-item class="checkbox-item">
                         <uni-data-checkbox :disabled="editingId !== item.id" v-model="item.defaultBank1"
                                            multiple :localdata="hobbys" />
@@ -207,16 +207,16 @@
                     </uni-col>
                     <uni-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
                       <view class="bank-actions">
-                        <view class="action-btn bg-secondary btn-dark"
+                        <view class="action-btn  btn-gray"
                               v-if="!editingId && item.authStatus !== 1" @tap="startEdit(item)"
                               v-t="'Btn.Editor'" />
                         <template v-if="editingId === item.id">
-                          <view class="action-btn bg-secondary btn-dark" @tap="saveBank(item)"
+                          <view class="action-btn  btn-gray" @tap="saveBank(item)"
                                 v-t="'Btn.Save'" />
-                          <view class="action-btn bg-secondary btn-dark" @tap="cancelEdit()"
+                          <view class="action-btn  btn-gray" @tap="cancelEdit()"
                                 v-t="'Btn.Cancel'" />
                         </template>
-                        <view class="action-btn delete btn-dark" @tap="confirmDelete(item)"
+                        <view class="action-btn  btn-gray" @tap="confirmDelete(item)"
                               v-t="'Btn.Delete'" />
                       </view>
                     </uni-col>
@@ -273,7 +273,7 @@
                                        :disabled="editingId !== item.id" />
                       </uni-forms-item>
                     </uni-col>
-                    <uni-col :xs="24">
+                    <uni-col :xs="24" class="mt-3">
                       <uni-forms-item class="checkbox-item">
                         <uni-data-checkbox :disabled="editingId !== item.id" v-model="item.defaultBank1"
                                            multiple :localdata="hobbys" />
@@ -304,16 +304,16 @@
                       </uni-col>
                       <uni-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
                         <view class="bank-actions">
-                          <view class="action-btn bg-secondary btn-dark"
+                          <view class="action-btn  btn-gray"
                                 v-if="!editingId && item.authStatus !== 1" @tap="startEdit(item)"
                                 v-t="'Btn.Editor'" />
                           <template v-if="editingId === item.id">
-                            <view class="action-btn bg-secondary btn-dark" @tap="saveBank(item)"
+                            <view class="action-btn  btn-gray" @tap="saveBank(item)"
                                   v-t="'Btn.Save'" />
-                            <view class="action-btn bg-secondary btn-dark" @tap="cancelEdit()"
+                            <view class="action-btn  btn-gray" @tap="cancelEdit()"
                                   v-t="'Btn.Cancel'" />
                           </template>
-                          <view class="action-btn delete btn-dark" @tap="confirmDelete(item)"
+                          <view class="action-btn  btn-gray" @tap="confirmDelete(item)"
                                 v-t="'Btn.Delete'" />
                         </view>
                       </uni-col>
@@ -348,7 +348,7 @@
                                        :placeholder="locale == 'es' ? 'Introduzca el CVV' : t('placeholder.input')" />
                       </uni-forms-item>
                     </uni-col>
-                    <uni-col :xs="24">
+                    <uni-col :xs="24" class="mt-3">
                       <uni-forms-item class="checkbox-item">
                         <uni-data-checkbox :disabled="editingId !== item.id" v-model="item.defaultBank1"
                                            multiple :localdata="hobbys" />
@@ -840,23 +840,23 @@
       }
 
       &.active {
-        background: var(--bs-secondary);
-        color: #ffffff;
+        background: #f5f5f5;
+        color: #000;
         border-radius: px2rpx(8);
 
         &:hover {
           background: var(--bs-link-hover-color-rgb);
-          color: #ffffff;
+          color: #333;
         }
       }
 
       &:hover {
-        background: var(--bs-link-hover-color-rgb);
-        color: var(--bs-secondary);
+        background: #f5f5f5;
+        color: #333;
       }
 
       &.active:hover {
-        background: #d11920;
+        background: #f5f5f5;
       }
     }
   }
@@ -957,7 +957,7 @@
       height: px2rpx(40);
       background: var(--bs-secondary);
       color: #fff;
-      border-radius: px2rpx(20);
+      border-radius: px2rpx(10);
       padding: 0 px2rpx(20);
       display: flex;
       align-items: center;
@@ -1117,5 +1117,11 @@
 
   .custom-row {
     gap: px2rpx(20); // 使用 gap 替代 gutter
+    :deep(.cwg-combox) {
+      .disabled-text{
+        height: 100%;
+      }
+      height: 3rem;
+    }
   }
 </style>

pages/mine/components/FileManagementTab.vue

@@ -27,10 +27,10 @@
                 <view :class="['status-badge', row.status]">{{ stateMap[row.status] }}</view>
             </template>
             <template #btn="{ row }">
-                <text class="btn-submit" :class="['operation-btn', row.status !== 4 ? 'disabled' : '']" @click.stop="openAddFile(row)">
+                <button class="btn-submit" :class="['operation-btn', row.status !== 4 ? 'disabled' : '']" @click.stop="openAddFile(row)">
                     <cwg-icon name="crm-image" :size="16" color="#1d293d" />
                     <text v-t="'State.Again'" />
-                </text>
+                </button>
             </template>
         </cwg-tabel>
         <add-file-dialog ref="addFileDialog" @file-added="customFileList" @success="addSuccess" />
@@ -209,6 +209,14 @@ defineProps<Props>();
 }
 
 .operation-btn {
+  display: flex;
+  width: px2rpx(120);
+  align-items: center;
+  justify-content: center;
+  padding: 0 px2rpx(10);
+  box-sizing: border-box;
+  height: px2rpx(36);
+  line-height: px2rpx(36);
     :deep(span) {
         display: flex;
         align-items: center;

pages/mine/components/PersonalInfoTab.vue

@@ -22,7 +22,7 @@
         <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
           <uni-forms ref="baseForm" :model="formData" labelWidth="200" label-position="top" :rules="rules"
             class="base-info-form">
-            <uni-row class="demo-uni-row uni-row1">
+            <uni-row class="demo-uni-row uni-row1" :gutter="10">
               <!-- cid -->
               <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                 <uni-forms-item :label="t('PersonalManagement.Label.UserCID')">
@@ -577,6 +577,7 @@ onMounted(async () => {
   .uni-select,
   .uni-combox,
   .uni-easyinput__content,
+
   .uni-date-editor--x {
     background-color: var(--bs-secondary-bg)!important;
     //background-color: var(--color-zinc-100) !important;

static/scss/global/global.scss

@@ -288,6 +288,7 @@
     --bs-btn-secondary-border-hover: #d93618;
     --bs-btn-secondary-active: #d93618;
     --cwg-placeholder-color: #909193;
+    --cwg-gray-color: #495057;
 }
 
 .dark {

static/scss/global/vu.css

@@ -3016,7 +3016,7 @@ textarea.form-control-lg {
   --bs-btn-bg: transparent;
   --bs-btn-border-width: var(--bs-border-width);
   --bs-btn-border-color: transparent;
-  --bs-btn-border-radius: 30px;
+  --bs-btn-border-radius: 10px;
   --bs-btn-hover-border-color: transparent;
   --bs-btn-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
   --bs-btn-disabled-opacity: 0.65;
@@ -3240,11 +3240,11 @@ textarea.form-control-lg {
 }
 
 .btn-gray {
-  --bs-btn-color: #ffffff;
-  --bs-btn-bg: #97A1C0;
+  --bs-btn-color: #333;
+  --bs-btn-bg: #f5f5f5;
   --bs-btn-border-color: #97A1C0;
-  --bs-btn-hover-color: #ffffff;
-  --bs-btn-hover-bg: #8089a3;
+  --bs-btn-hover-color: #333;
+  --bs-btn-hover-bg: #EFEFEF;
   --bs-btn-hover-border-color: #79819a;
   --bs-btn-focus-shadow-rgb: 167, 175, 201;
   --bs-btn-active-color: #ffffff;
@@ -3342,19 +3342,20 @@ textarea.form-control-lg {
 }
 
 .btn-outline-danger {
-  --bs-btn-color: #FF401C;
-  --bs-btn-border-color: #FF401C;
+    --bs-btn-bg:#FFF5F5;
+  --bs-btn-color: var(--bs-emphasis-color);
+  --bs-btn-border-color: #EE1C25;
   --bs-btn-hover-color: #ffffff;
-  --bs-btn-hover-bg: #FF401C;
-  --bs-btn-hover-border-color: #FF401C;
+  --bs-btn-hover-bg: #EE1C25;
+  --bs-btn-hover-border-color: #EE1C25;
   --bs-btn-focus-shadow-rgb: 255, 64, 28;
   --bs-btn-active-color: #ffffff;
-  --bs-btn-active-bg: #FF401C;
-  --bs-btn-active-border-color: #FF401C;
+  --bs-btn-active-bg: #EE1C25;
+  --bs-btn-active-border-color: #EE1C25;
   --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-  --bs-btn-disabled-color: #FF401C;
+  --bs-btn-disabled-color: #EE1C25;
   --bs-btn-disabled-bg: transparent;
-  --bs-btn-disabled-border-color: #FF401C;
+  --bs-btn-disabled-border-color: #EE1C25;
   --bs-gradient: none;
 }
 
@@ -3926,7 +3927,7 @@ textarea.form-control-lg {
   --bs-nav-link-padding-y: 0.5rem;
   --bs-nav-link-font-weight: ;
   --bs-nav-link-color: var(--bs-body-color);
-  --bs-nav-link-hover-color: var(--bs-secondary);
+  --bs-nav-link-hover-color: var(--bs-emphasis-color);
   --bs-nav-link-disabled-color: var(--bs-secondary-color);
   display: flex;
   flex-wrap: wrap;
@@ -3997,8 +3998,8 @@ textarea.form-control-lg {
 
 .nav-pills {
   --bs-nav-pills-border-radius: var(--bs-border-radius);
-  --bs-nav-pills-link-active-color: #ffffff;
-  --bs-nav-pills-link-active-bg: var(--bs-secondary);
+  --bs-nav-pills-link-active-color: #333;
+  --bs-nav-pills-link-active-bg: #f5f5f5;
 }
 .nav-pills .nav-link {
   border-radius: var(--bs-nav-pills-border-radius);
@@ -16998,17 +16999,17 @@ html[data-bs-theme=dark] .text-bg-light {
   background-color: var(--bs-success);
 }
 
-.btn-primary {
-  --bs-btn-bg: var(--bs-secondary);
-  --bs-btn-border-color: var(--bs-secondary);
-  --bs-btn-hover-bg: var(--bs-secondary);
-  --bs-btn-hover-border-color: var(--bs-btn-secondary-border-hover);
-  --bs-btn-focus-shadow-rgb: var(--bs-secondary-rgb);
-  --bs-btn-active-bg: var(--bs-btn-primary-active);
-  --bs-btn-active-border-color: var(--bs-btn-primary-active);
-  --bs-btn-disabled-bg: var(--bs-secondary);
-  --bs-btn-disabled-border-color: var(--bs-secondary);
-}
+/*.btn-primary {*/
+/*  --bs-btn-bg: var(--bs-secondary);*/
+/*  --bs-btn-border-color: var(--bs-secondary);*/
+/*  --bs-btn-hover-bg: var(--bs-secondary);*/
+/*  --bs-btn-hover-border-color: var(--bs-btn-secondary-border-hover);*/
+/*  --bs-btn-focus-shadow-rgb: var(--bs-secondary-rgb);*/
+/*  --bs-btn-active-bg: var(--bs-btn-primary-active);*/
+/*  --bs-btn-active-border-color: var(--bs-btn-primary-active);*/
+/*  --bs-btn-disabled-bg: var(--bs-secondary);*/
+/*  --bs-btn-disabled-border-color: var(--bs-secondary);*/
+/*}*/
 
 .btn-outline-primary {
   --bs-btn-color: var(--bs-secondary);

uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@@ -205,6 +205,7 @@ export default {
 						this.getCollapseHeight(false, index)
 						return
 					}
+          console.log(data,'asdasd')
 					// #ifdef APP-NVUE
 					this.height = data.height + 1
 					// #endif

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -53,8 +53,9 @@
 								:class="{ 'uni-select__selector-item': true, 'uni-select__selector-item--actived': item.value === modelValue }"
 								class="" v-for="(item, index) in mixinDatacomResData" :key="index"
 								@click="change(item)">
-								<text :class="{ 'uni-select__selector__disabled': item.disable }">{{
-									formatItemName(item) }}</text>
+								<text :class="{ 'uni-select__selector__disabled': item.disable }">
+                  {{item.disable?'':'&nbsp;&nbsp;'}}
+                  {{formatItemName(item) }}</text>
 							</view>
 							<view v-if="multiple && mixinDatacomResData.length > 0">
 								<checkbox-group @change="checkBoxChange">
@@ -739,6 +740,11 @@ $uni-info: #909399 !default;
 	color: var(--bs-heading-color);
   white-space: nowrap;
 }
+.uni-select__selector-item:hover{
+  --bs-bg-opacity: 1;
+  background-color: rgba(var(--bs-secondary-bg-rgb), var(--bs-bg-opacity)) !important;
+  color: var(--bs-heading-color);
+}
 .uni-select__selector-item uni-text{
   white-space: nowrap;
 }

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -7,7 +7,7 @@
 			</slot>
 			<!-- #ifdef MP-ALIPAY -->
 			<textarea :enableNative="enableNative" v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
-				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder"
+				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="disabled?'':placeholder"
 				:placeholderStyle="placeholderStyle" :disabled="disabled"
 				placeholder-class="uni-easyinput__placeholder-class" :minlength="inputMinlength" :maxlength="inputMaxlength" :focus="focused"
 				:autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition"
@@ -15,7 +15,7 @@
 				@keyboardheightchange="onkeyboardheightchange" @wheel.prevent></textarea>
 			<input :enableNative="enableNative" v-else :type="type === 'password' ? 'text' : type"
 				class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val"
-				:password="!showPassword && type === 'password'" :placeholder="placeholder"
+				:password="!showPassword && type === 'password'" :placeholder="disabled?'':placeholder"
 				:placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class"
 				:disabled="disabled" :minlength="inputMinlength" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType"
 				:cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur"
@@ -23,7 +23,7 @@
 			<!-- #endif -->
 			<!-- #ifndef MP-ALIPAY -->
 			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
-				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder"
+				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="disabled?'':placeholder"
 				:placeholderStyle="placeholderStyle" :disabled="disabled"
 				placeholder-class="uni-easyinput__placeholder-class" :minlength="inputMinlength" :maxlength="inputMaxlength" :focus="focused"
 				:autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition"
@@ -31,7 +31,7 @@
 				@keyboardheightchange="onkeyboardheightchange" @wheel.prevent></textarea>
 			<input v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input"
 				:style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'"
-				:placeholder="placeholder" :placeholderStyle="placeholderStyle"
+				:placeholder="disabled?'':placeholder" :placeholderStyle="placeholderStyle"
 				placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :minlength="inputMinlength" :maxlength="inputMaxlength"
 				:focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing"
 				:adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm"

windows/left-window.vue

@@ -22,23 +22,23 @@
     <view class="menu fixed">
       <view class="menu-item btn-danger btn btn-app-nav btn-danger btn-shadow mb-2 w-100 waves-effect ib-box btn-mode"
         @click="setMode('customer')" v-if="mode !== 'customer'">
-        <cwg-icon name="crm-trade" :size="20" color="#fff" />
+        <cwg-icon name="crm-trade" :size="20" color="#000" />
         <view class="menu-label" v-t="'Home.msg.Custom'" />
       </view>
-      <view class="menu-item btn-danger btn btn-app-nav btn-danger btn-shadow mb-2 w-100 waves-effect ib-box btn-mode"
+      <view class="menu-item btn-outline-danger btn btn-app-nav btn-shadow mb-2 w-100 waves-effect ib-box btn-mode"
         @click="setMode('ib')" v-if="mode !== 'ib' && ibStatus">
-        <cwg-icon name="crm-ib" :size="20" color="#fff" />
+        <cwg-icon name="crm-ib" :size="20" color="#000" />
         <view class="menu-label" v-t="'Home.msg.Ib'" />
       </view>
-      <view class="menu-item btn-danger btn btn-app-nav btn-danger btn-shadow mb-2 w-100 waves-effect ib-box btn-mode"
+      <view class="menu-item btn-outline-danger btn btn-app-nav btn-shadow mb-2 w-100 waves-effect ib-box btn-mode"
         @click="setMode('follow')" v-if="mode !== 'follow'">
-        <cwg-icon name="crm-gd" :size="20" color="#fff" />
+        <cwg-icon name="crm-gd" :size="20" color="#000" />
         <view class="menu-label" v-t="'Documentary.title'" />
       </view>
-      <view class="menu-item btn-danger btn btn-app-nav btn-danger btn-shadow mb-2 w-100 waves-effect zy-box"
+      <view class="menu-item btn-outline-danger btn btn-app-nav btn-shadow mb-2 w-100 waves-effect zy-box"
         @click="handleFixedMenuClick">
         <view class="zy-icon1" :class="{ 'active': isCollapsed }">
-          <cwg-icon name="crm-zy" :size="20" color="#fff" />
+          <cwg-icon name="crm-zy" :size="20" color="#000" />
         </view>
 
       </view>
@@ -163,10 +163,10 @@ function handleFixedMenuClick() {
     border: var(--bs-btn-border-width) solid var(--bs-btn-border-color);
     border-radius: var(--bs-btn-border-radius);
     background-color: var(--bs-btn-bg);
-    border: 1px solid rgba(140, 69, 246, 0.2) !important;
+    //border: 1px solid rgba(140, 69, 246, 0.2) !important;
     font-size: px2rpx(18);
     font-weight: 600;
-    color: #fff;
+    //color: #fff;
 
     &:hover {
       color: var(--bs-btn-hover-color);