1

App.vue

@@ -71,7 +71,7 @@ onLaunch((options) => {
 	// updateRoute();
 	// checkUpdate()
 	// 调用初始化
-	initTheme()
+	// initTheme()
 })
 
 watch(locale, () => {

pages/activities/index.vue

@@ -25,7 +25,7 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a href="#"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
@@ -60,7 +60,7 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a href="#"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
@@ -100,7 +100,7 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a @click="openSurplusActivityDialog1()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
@@ -109,22 +109,23 @@
                                         <h4> <text class="text-dark crm-one-font"
                                                 v-t="'MonthlyActivities.item1'"></text> </h4>
                                         <view class="crm-one-font"></view>
-                                        <button type="submit" value="Submit"
-                                            :class="['btn mb-3 waves-effect waves-light', monthlyGive ? 'btn-danger' : 'btn-disabled']"
-                                            @click="openSurplusActivityDialog1()">
-                                            <text v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text>
-                                        </button>
-                                        <cwg-link type="pdf" class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            target="_blank" title="wallet.item15"
-                                            :url="`pdf/pdf13/CWG Prime Bonus-cn.pdf`" />
-                                        <cwg-link type="pdf" class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            target="_blank" title="Transfer.item7"
-                                            :url="`pdf/pdf13/CWG Markets Prime Bonus Application Process-cn.pdf`" />
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="goMonthlyTaskList()">
-                                            <text v-t="'wallet.item14'"></text>
-                                        </button>
+                                        <view class="d-flex flex-wrap gap-2">
+                                            <view
+                                                :class="['btn waves-effect waves-light', monthlyGive ? 'btn-danger' : 'btn-disabled']"
+                                                @click="openSurplusActivityDialog1()">
+                                                <text v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text>
+                                            </view>
+                                            <cwg-link type="pdf" class="btn btn-outline-dark waves-effect waves-light"
+                                                target="_blank" title="wallet.item15"
+                                                :url="`pdf/pdf13/CWG Prime Bonus-cn.pdf`" />
+                                            <cwg-link type="pdf" class="btn btn-outline-dark waves-effect waves-light"
+                                                target="_blank" title="Transfer.item7"
+                                                :url="`pdf/pdf13/CWG Markets Prime Bonus Application Process-cn.pdf`" />
+                                            <view class="btn btn-outline-dark waves-effect waves-light"
+                                                @click="goMonthlyTaskList()">
+                                                <text v-t="'wallet.item14'"></text>
+                                            </view>
+                                        </view>
                                     </view>
                                 </view>
                             </view>
@@ -142,7 +143,7 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a @click="openSurplusActivityDialog()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
@@ -150,29 +151,31 @@
                                     <view class="card-body px-3 py-2">
                                         <h4> <text class="text-dark crm-one-font" v-t="'surplusList.item1'"></text>
                                         </h4>
-                                        <view class="crm-one-font" v-t="'surplusList.item2'"></view>
-                                        <button type="submit" value="Submit"
-                                            :class="['btn mb-3 waves-effect waves-light', surplusGive ? 'btn-danger' : 'btn-disabled']"
-                                            @click="openSurplusActivityDialog()">
-                                            <text v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text>
-                                        </button>
-                                        <cwg-link type="pdf" class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            target="_blank" title="wallet.item15"
-                                            :url="`pdf/pdf12/CWG Prime Bonus-${locale}.pdf`" />
-                                        <cwg-link type="pdf"
-                                            v-if="locale == 'cn' || locale == 'zhHant' || locale == 'en'"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light" target="_blank"
-                                            title="Transfer.item7"
-                                            :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-${locale}.pdf`" />
-                                        <cwg-link type="pdf" v-else
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light" target="_blank"
-                                            title="Transfer.item7"
-                                            :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-en.pdf`" />
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="goSurplusTaskList()">
-                                            <text v-t="'wallet.item14'"></text>
-                                        </button>
+                                        <p class="crm-one-font" v-t="'surplusList.item2'"></p>
+                                        <view class="d-flex flex-wrap gap-2">
+                                            <view
+                                                :class="['btn mb-3 waves-effect waves-light', surplusGive ? 'btn-danger' : 'btn-disabled']"
+                                                @click="openSurplusActivityDialog()">
+                                                <text v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text>
+                                            </view>
+                                            <cwg-link type="pdf"
+                                                class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                target="_blank" title="wallet.item15"
+                                                :url="`pdf/pdf12/CWG Prime Bonus-${locale}.pdf`" />
+                                            <cwg-link type="pdf"
+                                                v-if="locale == 'cn' || locale == 'zhHant' || locale == 'en'"
+                                                class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                target="_blank" title="Transfer.item7"
+                                                :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-${locale}.pdf`" />
+                                            <cwg-link type="pdf" v-else
+                                                class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                target="_blank" title="Transfer.item7"
+                                                :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-en.pdf`" />
+                                            <view class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                @click="goSurplusTaskList()">
+                                                <text v-t="'wallet.item14'"></text>
+                                            </view>
+                                        </view>
                                     </view>
                                 </view>
                             </view>
@@ -190,7 +193,7 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a @click="toApplyCptOpen()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
@@ -198,28 +201,27 @@
                                     <view class="card-body px-3 py-2">
                                         <h4> <text class="text-dark crm-one-font"
                                                 v-t="'news_add_field1.activitiesJYDS2025.item1'"></text> </h4>
-                                        <view class="crm-one-font" v-t="'news_add_field1.activitiesJYDS2025.item2'">
+                                        <p class="crm-one-font" v-t="'news_add_field1.activitiesJYDS2025.item2'">
+                                        </p>
+                                        <view class="d-flex flex-wrap gap-2">
+                                            <view class="btn btn-danger  waves-effect waves-light"
+                                                v-if="tableDataCpt.signStatus == 0" @click="toApplyCptOpen()">
+                                                <text v-t="'news_add_field1.activitiesJYDS.item3'"></text>
+                                            </view>
+                                            <view class="btn btn-disabled  waves-effect waves-light"
+                                                v-if="tableDataCpt.signStatus == 1">
+                                                <text v-t="'news_add_field1.activitiesJYDS.item3_1'"></text>
+                                            </view>
+                                            <view class="btn btn-outline-dark  waves-effect waves-light"
+                                                @click="toSingle('23xinjia')">
+                                                <text v-t="'news_add_field1.activitiesJYDS.item4'"></text>
+                                            </view>
+                                            <view class="btn btn-outline-dark  waves-effect waves-light"
+                                                @click="toOpenSingle(tableDataCpt.pageAddress)">
+                                                <text v-t="'news_add_field1.activitiesJYDS.item4_1'"></text>
+                                            </view>
                                         </view>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-danger mb-3 waves-effect waves-light"
-                                            v-if="tableDataCpt.signStatus == 0" @click="toApplyCptOpen()">
-                                            <text v-t="'news_add_field1.activitiesJYDS.item3'"></text>
-                                        </button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-disabled mb-3 waves-effect waves-light"
-                                            v-if="tableDataCpt.signStatus == 1">
-                                            <text v-t="'news_add_field1.activitiesJYDS.item3_1'"></text>
-                                        </button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="toSingle('23xinjia')">
-                                            <text v-t="'news_add_field1.activitiesJYDS.item4'"></text>
-                                        </button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="toOpenSingle(tableDataCpt.pageAddress)">
-                                            <text v-t="'news_add_field1.activitiesJYDS.item4_1'"></text>
-                                        </button>
+
                                     </view>
                                 </view>
                             </view>
@@ -229,7 +231,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">
+                                <view class="col-md-4" 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" />
@@ -237,24 +239,26 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a @click="toActivity24nianzhong()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
                                 <view class="col-md-8 py-3 d-flex flex-column">
                                     <view class="card-body px-3 py-2">
                                         <h4> <text class="text-dark crm-one-font">{{ item.title }}</text> </h4>
-                                        <view class="crm-one-font">{{ item.subTitle }}</view>
-                                        <button type="submit" value="Submit"
-                                            :class="['btn mb-3 waves-effect waves-light', item.valid == 1 ? 'btn-danger' : 'btn-disabled']"
-                                            @click="toActivity24nianzhong()">
-                                            <text v-t="'Custom.Activity.Apply'"></text>
-                                        </button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="toSingle('newList', item.id)">
-                                            <text v-t="'Custom.Activity.Single'"></text>
-                                        </button>
+                                        <p class="crm-one-font">{{ item.subTitle }}</p>
+                                        <view class="d-flex flex-wrap gap-2">
+                                            <view
+                                                :class="['btn  waves-effect waves-light', item.valid == 1 ? 'btn-danger' : 'btn-disabled']"
+                                                @click="toActivity24nianzhong()">
+                                                <text v-t="'Custom.Activity.Apply'"></text>
+                                            </view>
+                                            <view class="btn btn-outline-dark  waves-effect waves-light"
+                                                @click="toSingle('newList', item.id)">
+                                                <text v-t="'Custom.Activity.Single'"></text>
+                                            </view>
+                                        </view>
+
                                     </view>
                                 </view>
                             </view>
@@ -264,7 +268,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">
+                                <view class="col-md-4" 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" />
@@ -272,29 +276,31 @@
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-dark bg-opacity-50 rounded d-flex align-items-center justify-content-center">
                                             <a @click="applications(item)"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                <i class="fi fi-rr-arrow-right"></i> </a>
+                                                →</a>
                                         </view>
                                     </view>
                                 </view>
                                 <view class="col-md-8 py-3 d-flex flex-column">
                                     <view class="card-body px-3 py-2">
                                         <h4> <text class="text-dark crm-one-font">{{ item.title }}</text> </h4>
-                                        <view class="crm-one-font">{{ item.subTitle }}</view>
-                                        <button type="submit" value="Submit"
-                                            :class="['btn mb-3 waves-effect waves-light', overdue(item.startTime, item.endTime) ? 'btn-danger' : 'btn-disabled']"
-                                            @click="applications(item)">
-                                            <text v-t="'Custom.Activity.Apply'"></text>
-                                        </button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="checkActivity(item)">
-                                            <text v-t="'Custom.Activity.List'"></text>
-                                        </button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light"
-                                            @click="toSingle(item.id)">
-                                            <text v-t="'Custom.Activity.Single'"></text>
-                                        </button>
+                                        <p class="crm-one-font">{{ item.subTitle }}</p>
+                                        <view class="d-flex flex-wrap gap-2">
+                                            <view
+                                                :class="['btn mb-3 waves-effect waves-light', overdue(item.startTime, item.endTime) ? 'btn-danger' : 'btn-disabled']"
+                                                @click="applications(item)">
+                                                <text v-t="'Custom.Activity.Apply'"></text>
+                                            </view>
+                                            <view type="submit" value="Submit"
+                                                class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                @click="checkActivity(item)">
+                                                <text v-t="'Custom.Activity.List'"></text>
+                                            </view>
+                                            <view type="submit" value="Submit"
+                                                class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                @click="toSingle(item.id)">
+                                                <text v-t="'Custom.Activity.Single'"></text>
+                                            </view>
+                                        </view>
                                     </view>
                                 </view>
                             </view>

pages/analytics/components/List.vue

@@ -30,7 +30,7 @@
       <view v-for="item in list" :key="item.id" class="col-12 m-b30">
         <view class="card card-action action-elevate action-border-primary" @click="handleItemClick(item)">
           <view class="row g-0">
-            <view class="col-md-3">
+            <view class="col-md-3" v-if="item.coverImage">
               <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
                 <image v-if="item.coverImage" :src="imgUrl + item.coverImage" class="img-fluid rounded"
                   mode="widthFix" />

pages/common/download.vue

@@ -145,8 +145,7 @@
                                                             <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> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
+                                                                        class="fi fi-rr-download"></i> 开始交易</view>
                                                             </cwg-link>
                                                         </view>
                                                     </view>
@@ -246,7 +245,7 @@
                                 <view v-if="activeName == 'MT5'">
                                     <view class="row">
                                         <view class="col-12">
-                                            <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item2'" />
+                                            <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item11'" />
                                             <p class="mb-5" v-t="'Downloadpage.item3'" />
                                         </view>
                                         <view class="col-lg-4 mb-5">
@@ -342,7 +341,7 @@
                                             </view>
                                         </view>
 
-                                        <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item38'" />
+                                        <h3 class="mb-3 fw-bold" v-t="'Downloadpage.item39'" />
                                         <view class="col-lg-4 mb-5">
                                             <view class="card card-action action-elevate action-border-primary">
                                                 <view class="row g-0">
@@ -364,8 +363,7 @@
                                                                 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> {{
-                                                                            t('Downloadpage.item6-1') }}</view>
+                                                                        class="fi fi-rr-download"></i> 开始交易</view>
                                                             </cwg-link>
                                                         </view>
                                                     </view>
@@ -501,6 +499,43 @@ onMounted(async () => {
 </script>
 <style lang="scss" scoped>
 @import "@/uni.scss";
+/* 让 card 本身等高，但内部元素自适应 */
+.row {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: stretch;
+}
+
+.row > [class*="col-lg-4"] {
+    display: flex;
+    flex-direction: column;
+}
+
+.card {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+/* 关键修改：让 card-body 不强制占满，只保持默认 */
+.card-body {
+    /* 移除 flex: 1，改为默认值 */
+    flex: 0 0 auto;
+    display: block;
+}
+
+/* 只有需要弹性填充的特定容器才使用 flex */
+.flex-column.d-flex {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+/* 按钮底部对齐只在需要的地方使用 */
+.card-body .btn {
+    margin-top: auto;
+}
 @media screen and (max-width: 768px) {
     .img-fluid {
         max-width: px2rpx(120);

pages/customer/components/TerminalDialog.vue

@@ -2,36 +2,36 @@
     <cwg-popup :title="t('Shop.Index.Transaction')" :visible="props.visible" :showFooters="false"
         @update:visible="$emit('update:visible', $event)">
         <view class="card-list">
-            <view class="card" @click="handleWebClick">
+            <view class="card cursor-pointer" @click="handleWebClick">
                 <view class="card-icon">
-                    <cwg-icon name="cwg-mt" :size="48" />
+                    <cwg-icon name="cwg-mt" :size="48" color="#fff"  />
                 </view>
                 <view class="card-content">
                     <text class="card-title">{{ webTitle }}</text>
                     <text class="card-desc">{{ t('Downloadpage.item40') }}</text>
                 </view>
                 <view class="card-arrow">
-                    <cwg-icon name="cwg-arrow" :size="24" color="#141d22" />
+                    <cwg-icon name="cwg-arrow" :size="24" />
                 </view>
             </view>
-            <view class="card" @click="handleDownloadClick">
+            <view class="card cursor-pointer" @click="handleDownloadClick">
                 <view class="card-icon">
-                    <cwg-icon name="cwg-mt" :size="48" />
+                    <cwg-icon name="cwg-mt" :size="48" color="#fff"  />
                 </view>
                 <view class="card-content">
                     <text class="card-title">{{ downloadItem.name }}</text>
                     <text class="card-desc">{{ downloadItem.description }}</text>
                 </view>
                 <view class="card-arrow">
-                    <cwg-icon name="cwg-arrow" :size="24" color="#141d22" />
+                    <cwg-icon name="cwg-arrow" :size="24"  />
                 </view>
             </view>
-            <view @click="handleClick" class="card">
+            <view class="card cursor-pointer" @click="handleClick">
                 <view class="card-content">
                     <text class="card-title" v-t="'vu.item13'"></text>
                 </view>
                 <view class="card-arrow">
-                    <cwg-icon name="cwg-arrow" :size="24" color="#141d22" />
+                    <cwg-icon name="cwg-arrow" :size="24"  />
                 </view>
             </view>
         </view>
@@ -169,7 +169,8 @@ const handleWebClick = () => {
     })
     // #endif
     // #ifdef H5
-    window.location.href = webUrl.value
+    // 新窗口打开链接
+    window.open(webUrl.value, '_blank')
     // #endif
 }
 

pages/customer/composables/TerminalMap.ts

@@ -28,7 +28,7 @@ export const TerminalMap = {
             ]
         },
         "web": {
-            "url": "https://www.{domain}.com/{lang}/mt4/web",
+            "url": "https://www.{domain}.com/{lang}/vu-mt4-web-trading/web",
             "descriptionKey": "Downloadpage.item40"
         },
         "mobile": {

stores/use-global-store.ts

@@ -11,7 +11,7 @@ const useStore = defineStore("globalStore", () => {
     isPageSwitching: false,
     statusBarHeight: 0,
     mode: 'customer',
-    theme: "dark",
+    theme: "light",
     // 认证状态
     applyStatus: false
   });