1

pages/activities/index.vue

@@ -5,185 +5,166 @@
                 <cwg-header :title="t('Home.page_customer.item6')" />
                 <!-- 主要内容 -->
                 <view class="main-content">
-                    <scroll-view class="tab" scroll-y :scroll-top="scrollTop" @scrolltolower="loadMore"
-                        refresher-enabled :refresher-triggered="refreshing" @refresherrefresh="onRefresh">
-                        <!-- 加载状态 -->
-                        <view class="table-loading-mask">
-                            <uni-loading v-if="pictLoading" />
-                        </view>
-                        <view class="activity-list" v-if="!pictLoading">
-                            <!-- CWG Markets 月赏礼遇 -->
-                            <view class="activity-card" v-if="country == 'CN'">
-                                <view class="btn-tag-star"><i class="el-icon-star-on"></i></view>
-                                <view class="card-content">
-                                    <view class="card-image crm-cursor">
-                                        <image class="img" src="/static/images/yue.jpg" alt="" />
+                    <view class="table-loading-mask">
+                        <uni-loading v-if="pictLoading" />
+                    </view>
+                    <view class="activity-list" v-if="!pictLoading">
+                        <!-- CWG Markets 月赏礼遇 -->
+                        <view class="activity-card" v-if="country == 'CN'">
+                            <view class="btn-tag-star"><i class="el-icon-star-on"></i></view>
+                            <view class="card-content">
+                                <view class="card-image crm-cursor">
+                                    <image class="img" src="/static/images/yue.jpg" alt="" />
+                                </view>
+                                <view class="card-body">
+                                    <view class="card-title">
+                                        <text class="title-text crm-cursor crm-one-font"><text
+                                                v-t="'MonthlyActivities.item1'"></text></text>
+                                    </view>
+                                    <view class="card-description crm-one-font">
+                                        <text v-t="''"></text>
                                     </view>
-                                    <view class="card-body">
-                                        <view class="card-title">
-                                            <text class="title-text crm-cursor crm-one-font"><text
-                                                    v-t="'MonthlyActivities.item1'"></text></text>
-                                        </view>
-                                        <view class="card-description crm-one-font">
-                                            <text v-t="''"></text>
-                                        </view>
-                                        <view class="card-actions">
-                                            <text
-                                                :class="['action-btn', monthlyGive ? 'primary crm-cursor' : 'disabled']"
-                                                @click="openSurplusActivityDialog1()"><text
-                                                    v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text></text>
-                                            <cwg-link type="pdf" class="action-btn secondary crm-cursor" target="_blank"
-                                                title="wallet.item15" :url="`pdf/pdf13/CWG Prime Bonus-cn.pdf`" />
-                                            <cwg-link type="pdf" class="action-btn secondary crm-cursor" target="_blank"
-                                                title="Transfer.item7"
-                                                :url="`pdf/pdf13/CWG Markets Prime Bonus Application Process-cn.pdf`" />
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="goMonthlyTaskList()"><text v-t="'wallet.item14'"></text></text>
-                                        </view>
+                                    <view class="card-actions">
+                                        <text :class="['action-btn', monthlyGive ? 'primary crm-cursor' : 'disabled']"
+                                            @click="openSurplusActivityDialog1()"><text
+                                                v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text></text>
+                                        <cwg-link type="pdf" class="action-btn secondary crm-cursor" target="_blank"
+                                            title="wallet.item15" :url="`pdf/pdf13/CWG Prime Bonus-cn.pdf`" />
+                                        <cwg-link type="pdf" class="action-btn secondary crm-cursor" target="_blank"
+                                            title="Transfer.item7"
+                                            :url="`pdf/pdf13/CWG Markets Prime Bonus Application Process-cn.pdf`" />
+                                        <text class="action-btn secondary crm-cursor" @click="goMonthlyTaskList()"><text
+                                                v-t="'wallet.item14'"></text></text>
                                     </view>
                                 </view>
                             </view>
-                            <!-- 赠金活动 -->
-                            <view class="activity-card">
-                                <view class="btn-tag-star"><i class="el-icon-star-on"></i></view>
-                                <view class="card-content">
-                                    <view class="card-image crm-cursor">
-                                        <image class="img" src="/static/images/su.png" alt="" />
+                        </view>
+                        <!-- 赠金活动 -->
+                        <view class="activity-card">
+                            <view class="btn-tag-star"><i class="el-icon-star-on"></i></view>
+                            <view class="card-content">
+                                <view class="card-image crm-cursor">
+                                    <image class="img" src="/static/images/su.png" alt="" />
+                                </view>
+                                <view class="card-body">
+                                    <view class="card-title">
+                                        <text class="title-text crm-cursor crm-one-font"><text
+                                                v-t="'surplusList.item1'"></text></text>
+                                    </view>
+                                    <view class="card-description crm-one-font">
+                                        <text v-t="'surplusList.item2'"></text>
                                     </view>
-                                    <view class="card-body">
-                                        <view class="card-title">
-                                            <text class="title-text crm-cursor crm-one-font"><text
-                                                    v-t="'surplusList.item1'"></text></text>
-                                        </view>
-                                        <view class="card-description crm-one-font">
-                                            <text v-t="'surplusList.item2'"></text>
-                                        </view>
-                                        <view class="card-actions">
-                                            <text
-                                                :class="['action-btn', surplusGive ? 'primary crm-cursor' : 'disabled']"
-                                                @click="openSurplusActivityDialog()"><text
-                                                    v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text></text>
-                                            <cwg-link type="pdf" class="action-btn secondary crm-cursor" 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="action-btn secondary crm-cursor" target="_blank"
-                                                title="Transfer.item7"
-                                                :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-${locale}.pdf`" />
-                                            <cwg-link type="pdf" v-else class="action-btn secondary crm-cursor"
-                                                target="_blank" title="Transfer.item7"
-                                                :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-en.pdf`" />
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="goSurplusTaskList()"><text v-t="'wallet.item14'"></text></text>
-                                        </view>
+                                    <view class="card-actions">
+                                        <text :class="['action-btn', surplusGive ? 'primary crm-cursor' : 'disabled']"
+                                            @click="openSurplusActivityDialog()"><text
+                                                v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text></text>
+                                        <cwg-link type="pdf" class="action-btn secondary crm-cursor" 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="action-btn secondary crm-cursor" target="_blank"
+                                            title="Transfer.item7"
+                                            :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-${locale}.pdf`" />
+                                        <cwg-link type="pdf" v-else class="action-btn secondary crm-cursor"
+                                            target="_blank" title="Transfer.item7"
+                                            :url="`pdf/pdf12/CWG Markets Prime Bonus Application Process-en.pdf`" />
+                                        <text class="action-btn secondary crm-cursor" @click="goSurplusTaskList()"><text
+                                                v-t="'wallet.item14'"></text></text>
                                     </view>
                                 </view>
                             </view>
-                            <!-- 交易大赛 -->
-                            <view class="activity-card" v-if="tableDataCptFlag">
-                                <view class="btn-tag-star"><i class="el-icon-star-on"></i></view>
-                                <view class="card-content">
-                                    <view class="card-image crm-cursor" @click="toSingle('23xinjia')">
-                                        <image class="img" src="/static/images/banner.jpg" alt="" />
+                        </view>
+                        <!-- 交易大赛 -->
+                        <view class="activity-card" v-if="tableDataCptFlag">
+                            <view class="btn-tag-star"><i class="el-icon-star-on"></i></view>
+                            <view class="card-content">
+                                <view class="card-image crm-cursor" @click="toSingle('23xinjia')">
+                                    <image class="img" src="/static/images/banner.jpg" alt="" />
+                                </view>
+                                <view class="card-body">
+                                    <view class="card-title">
+                                        <text class="title-text crm-cursor crm-one-font"
+                                            @click="toSingle('23xinjia')"><text
+                                                v-t="'news_add_field1.activitiesJYDS2025.item1'"></text></text>
+                                    </view>
+                                    <view class="card-description crm-one-font">
+                                        <text v-t="'news_add_field1.activitiesJYDS2025.item2'"></text>
                                     </view>
-                                    <view class="card-body">
-                                        <view class="card-title">
-                                            <text class="title-text crm-cursor crm-one-font"
-                                                @click="toSingle('23xinjia')"><text
-                                                    v-t="'news_add_field1.activitiesJYDS2025.item1'"></text></text>
-                                        </view>
-                                        <view class="card-description crm-one-font">
-                                            <text v-t="'news_add_field1.activitiesJYDS2025.item2'"></text>
-                                        </view>
-                                        <view class="card-actions">
-                                            <text class="action-btn primary crm-cursor" @click="toApplyCptOpen()"
-                                                v-if="tableDataCpt.signStatus == 0"><text
-                                                    v-t="'news_add_field1.activitiesJYDS.item3'"></text></text>
-                                            <text class="action-btn disabled crm-cursor"
-                                                v-if="tableDataCpt.signStatus == 1"><text
-                                                    v-t="'news_add_field1.activitiesJYDS.item3_1'"></text></text>
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="toSingle('23xinjia')"><text
-                                                    v-t="'news_add_field1.activitiesJYDS.item4'"></text></text>
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="toOpenSingle(tableDataCpt.pageAddress)"><text
-                                                    v-t="'news_add_field1.activitiesJYDS.item4_1'"></text></text>
-                                        </view>
+                                    <view class="card-actions">
+                                        <text class="action-btn primary crm-cursor" @click="toApplyCptOpen()"
+                                            v-if="tableDataCpt.signStatus == 0"><text
+                                                v-t="'news_add_field1.activitiesJYDS.item3'"></text></text>
+                                        <text class="action-btn disabled crm-cursor"
+                                            v-if="tableDataCpt.signStatus == 1"><text
+                                                v-t="'news_add_field1.activitiesJYDS.item3_1'"></text></text>
+                                        <text class="action-btn secondary crm-cursor"
+                                            @click="toSingle('23xinjia')"><text
+                                                v-t="'news_add_field1.activitiesJYDS.item4'"></text></text>
+                                        <text class="action-btn secondary crm-cursor"
+                                            @click="toOpenSingle(tableDataCpt.pageAddress)"><text
+                                                v-t="'news_add_field1.activitiesJYDS.item4_1'"></text></text>
                                     </view>
                                 </view>
                             </view>
-                            <!-- 赠送活动列表2 -->
-                            <view class="activity-card" v-for="(item, index) in tableDataGive" :key="index + 'give'">
-                                <view class="btn-tag-star" v-if="item.hot">
-                                    <i class="el-icon-star-on"></i>
+                        </view>
+                        <!-- 赠送活动列表2 -->
+                        <view class="activity-card" v-for="(item, index) in tableDataGive" :key="index + 'give'">
+                            <view class="btn-tag-star" v-if="item.hot">
+                                <i class="el-icon-star-on"></i>
+                            </view>
+                            <view class="card-content">
+                                <view class="card-image crm-cursor" @click="toSingle('newList', item.id)">
+                                    <image class="img" :src="imgUrl + item.coverUrl" alt="" />
                                 </view>
-                                <view class="card-content">
-                                    <view class="card-image crm-cursor" @click="toSingle('newList', item.id)">
-                                        <image class="img" :src="imgUrl + item.coverUrl" alt="" />
+                                <view class="card-body">
+                                    <view class="card-title">
+                                        <text class="title-text crm-cursor crm-one-font"
+                                            @click="toSingle('newList', item.id)">{{ item.title }}</text>
+                                        <text class="card-time">{{ item.revokeDate.split(" ")[0] }}</text>
                                     </view>
-                                    <view class="card-body">
-                                        <view class="card-title">
-                                            <text class="title-text crm-cursor crm-one-font"
-                                                @click="toSingle('newList', item.id)">{{ item.title }}</text>
-                                            <text class="card-time">{{ item.revokeDate.split(" ")[0] }}</text>
-                                        </view>
-                                        <view class="card-description crm-one-font">{{ item.subTitle }}</view>
-                                        <view class="card-actions">
-                                            <text class="action-btn primary crm-cursor" @click="toActivity24nianzhong()"
-                                                v-if="item.valid == 1"><text
-                                                    v-t="'Custom.Activity.Apply'"></text></text>
-                                            <text class="action-btn disabled crm-cursor" v-else><text
-                                                    v-t="'Custom.Activity.Apply'"></text></text>
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="toSingle('newList', item.id)"><text
-                                                    v-t="'Custom.Activity.Single'"></text></text>
-                                        </view>
+                                    <view class="card-description crm-one-font">{{ item.subTitle }}</view>
+                                    <view class="card-actions">
+                                        <text class="action-btn primary crm-cursor" @click="toActivity24nianzhong()"
+                                            v-if="item.valid == 1"><text v-t="'Custom.Activity.Apply'"></text></text>
+                                        <text class="action-btn disabled crm-cursor" v-else><text
+                                                v-t="'Custom.Activity.Apply'"></text></text>
+                                        <text class="action-btn secondary crm-cursor"
+                                            @click="toSingle('newList', item.id)"><text
+                                                v-t="'Custom.Activity.Single'"></text></text>
                                     </view>
                                 </view>
                             </view>
-                            <view class="activity-card" v-for="(item, index) in tableData" :key="index + 'tttt'">
-                                <view class="btn-tag-star" v-if="item.hot">
-                                    <i class="el-icon-star-on"></i>
+                        </view>
+                        <view class="activity-card" v-for="(item, index) in tableData" :key="index + 'tttt'">
+                            <view class="btn-tag-star" v-if="item.hot">
+                                <i class="el-icon-star-on"></i>
+                            </view>
+                            <view class="card-content">
+                                <view class="card-image crm-cursor" @click="toSingle('newList', item.id)">
+                                    <image class="img" :src="imgUrl + item.coverUrl" alt="" />
                                 </view>
-                                <view class="card-content">
-                                    <view class="card-image crm-cursor" @click="toSingle('newList', item.id)">
-                                        <image class="img" :src="imgUrl + item.coverUrl" alt="" />
+                                <view class="card-body">
+                                    <view class="card-title">
+                                        <text class="title-text crm-cursor crm-one-font" @click="toSingle(item.id)">{{
+                                            item.title }}</text>
+                                        <text class="card-time">{{ item.deliveryTime.split(" ")[0] }}</text>
                                     </view>
-                                    <view class="card-body">
-                                        <view class="card-title">
-                                            <text class="title-text crm-cursor crm-one-font"
-                                                @click="toSingle(item.id)">{{ item.title }}</text>
-                                            <text class="card-time">{{ item.deliveryTime.split(" ")[0] }}</text>
-                                        </view>
-                                        <view class="card-description crm-one-font">{{ item.subTitle }}</view>
-                                        <view class="card-actions">
-                                            <text class="action-btn primary crm-cursor" @click="applications(item)"
-                                                v-if="overdue(item.startTime, item.endTime)"><text
-                                                    v-t="'Custom.Activity.Apply'"></text></text>
-                                            <text class="action-btn disabled crm-cursor" v-else><text
-                                                    v-t="'Custom.Activity.Apply'"></text></text>
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="checkActivity(item)"><text
-                                                    v-t="'Custom.Activity.List'"></text></text>
-                                            <text class="action-btn secondary crm-cursor"
-                                                @click="toSingle(item.id)"><text
-                                                    v-t="'Custom.Activity.Single'"></text></text>
-                                        </view>
+                                    <view class="card-description crm-one-font">{{ item.subTitle }}</view>
+                                    <view class="card-actions">
+                                        <text class="action-btn primary crm-cursor" @click="applications(item)"
+                                            v-if="overdue(item.startTime, item.endTime)"><text
+                                                v-t="'Custom.Activity.Apply'"></text></text>
+                                        <text class="action-btn disabled crm-cursor" v-else><text
+                                                v-t="'Custom.Activity.Apply'"></text></text>
+                                        <text class="action-btn secondary crm-cursor" @click="checkActivity(item)"><text
+                                                v-t="'Custom.Activity.List'"></text></text>
+                                        <text class="action-btn secondary crm-cursor" @click="toSingle(item.id)"><text
+                                                v-t="'Custom.Activity.Single'"></text></text>
                                     </view>
                                 </view>
                             </view>
                         </view>
-                        <!-- 加载更多状态 -->
-                        <view v-if="loadingMore" class="loading-more">
-                            <uni-icons type="spinner-cycle" size="20" color="#999" class="spin"></uni-icons>
-                            <!-- <text>{{ t('common.loadingMore') }}</text> -->
-                        </view>
-                        <!-- 没有更多数据 -->
-                        <view v-if="!hasMore && tableData.length > 0" class="no-more">
-                            <!-- <text>{{ t('common.noMore') }}</text> -->
-                        </view>
-                    </scroll-view>
+                    </view>
                 </view>
                 <!-- 分页 -->
                 <!-- <view class="crm_pagination" v-if="pagerInfo.rowTotal">
@@ -434,7 +415,7 @@
                 <button type="primary" @click="toApplyNoWorries">{{
                     t('news_add_field1.activitiesNoWorries.item6_1') }}</button>
                 <button @click="toApplyNoWorriesCancel">{{ t('news_add_field1.activitiesNoWorries.item6_2')
-                }}</button>
+                    }}</button>
             </template>
         </cwg-popup>
 
@@ -449,7 +430,7 @@
                 <button type="primary" @click="realizationNoWorries">{{
                     t('news_add_field1.activitiesNoWorries.item6_1') }}</button>
                 <button @click="dialogNoWorries = false">{{ t('news_add_field1.activitiesNoWorries.item6_2')
-                    }}</button>
+                }}</button>
             </template>
         </cwg-popup>
 
@@ -464,7 +445,7 @@
                 <button type="primary" @click="dialogNoWorriesApply = false">{{
                     t('news_add_field1.activitiesNoWorries.item6_1') }}</button>
                 <button @click="dialogNoWorriesApply = false">{{ t('news_add_field1.activitiesNoWorries.item6_2')
-                }}</button>
+                    }}</button>
             </template>
         </cwg-popup>
 
@@ -489,7 +470,7 @@
             </view>
             <template #footer>
                 <button type="primary" @click="calculateIncome">{{ t('news_add_field1.NewYear24.item8_1')
-                    }}</button>
+                }}</button>
                 <button @click="openCalculatorFlag = false">{{ t('news_add_field1.NewYear24.item8_2') }}</button>
             </template>
         </cwg-popup>
@@ -635,6 +616,7 @@
                 <button type="primary" @click="confirmSurplusActivity1">{{ t('Btn.Confirm') }}</button>
             </template>
         </cwg-popup>
+        <cwg-confirm-popup />
     </cwg-page-wrapper>
 </template>
 

pages/common/download.vue

@@ -50,7 +50,7 @@
                         </view>
                         <view class="download-cards">
                             <cwg-link type="html" class="download-card download-card-web" target="_blank"
-                                :url="'https://www.' + link + '.com/' + getLang(lang) + '/mt4/web'">
+                                :url="'https://www.' + link + '.com/' + locale + '/mt4/web'">
                                 <view class="card-info">
                                     <view class="card-title" v-t="'Downloadpage.item40'" />
                                 </view>
@@ -148,7 +148,7 @@
                         </view>
                         <view class="download-cards">
                             <cwg-link type="html" class="download-card download-card-web" target="_blank"
-                                :url="'https://www.' + link + '.com/' + getLang(lang) + '/mt5/web'">
+                                :url="'https://www.' + link + '.com/' + locale + '/mt5/web'">
                                 <view class="card-info">
                                     <view class="card-title" v-t="'Downloadpage.item40'" />
                                 </view>

pages/customer/deposit.vue

@@ -1603,7 +1603,6 @@ const showTable = () => {
     params.promoCode = ""
     isChannel.value = true
     imageUrl.value = ""
-    bankDate.value = []
     code.value = ""
     WireTransferAccount.bankMsg = ""
     introduce.introduce = ""
@@ -1628,7 +1627,6 @@ const bankOptions = computed(() => {
         value: item.code
     }))
 })
-console.log(bankOptions.value, 1111);
 
 // 获取账户信息
 const getDateList = async () => {
@@ -1878,11 +1876,8 @@ function formatChannels(data) {
 }
 // 生命周期
 onMounted(() => {
-	console.log(userInfo.value,121212)
-	console.log(channelList.value,userStore.channelList, 12121212);
     if (channelList.value) {
         channelListOptions.value = formatChannels(channelList.value)
-        console.log(channelListOptions.value, 12121212);
     }
     channelId.value = channel.value
     getDateList()

pages/ib/withdraw.vue

@@ -10,7 +10,7 @@
                     <view class="b-card">
                         <view class="card-top">
                             <text class="tit">{{ t('Custom.Deposit.Title22')
-                                }}</text>
+                            }}</text>
                             <cwg-combox :clearable="false" v-model:value="channelId" :options="channelListOptions"
                                 :placeholder="t('placeholder.choose')">
                             </cwg-combox>
@@ -133,7 +133,7 @@
                                                 </text>
                                                 <text v-if="channelData.type == 'BANK'">{{
                                                     t('Custom.Withdraw.addBank')
-                                                    }}</text>
+                                                }}</text>
                                                 <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                                                     @click="openAddBankCard('add_bankCard')">
                                                     {{ t('Custom.Withdraw.addBank1') }}
@@ -280,7 +280,7 @@
                                     <view v-if="channelData.type != 'BANK_TELEGRAPHIC'">
                                         <view class="tit">
                                             <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                                                }}</text>
+                                            }}</text>
                                         </view>
                                     </view>
                                     <view v-if="channelData.type != 'BANK_TELEGRAPHIC'" class="amount-box amount-box1">
@@ -1782,6 +1782,18 @@ watch(() => form.amount, (newVal) => {
     }
 }
 
+@media (max-width: 992px) {
+    .custom-withdraw {
+        width: 100%;
+        margin-top: px2rpx(20);
+    }
+
+    .custom-deposit-container {
+        display: flex;
+        gap: px2rpx(30);
+        flex-wrap: wrap;
+    }
+}
 
 .amount-box {
     display: flex;