1

pages/activities/components/GiftApplicationPopup.vue

@@ -35,8 +35,8 @@
       </uni-forms>
     </view>
     <template #footer>
-      <button @click="cancel">{{ t('Btn.Cancel') }}</button>
-      <button type="primary" @click="submit" :loading="submitting">{{ t('Btn.Confirm') }}</button>
+      <button class="btn btn-dark btn-sm waves-effect waves-light btn-outline-dark1" @click="cancel">{{ t('Btn.Cancel') }}</button>
+      <button class="btn btn-primary btn-sm waves-effect waves-light" @click="submit" :loading="submitting">{{ t('Btn.Confirm') }}</button>
     </template>
   </cwg-popup>
 </template>

pages/activities/index.vue

@@ -111,7 +111,7 @@
                                         <view class="crm-one-font"></view>
                                         <view class="d-flex flex-wrap gap-2">
                                             <view
-                                                :class="['btn waves-effect waves-light', monthlyGive ? 'btn-danger' : 'disabled']"
+                                                :class="['btn btn-dark waves-effect waves-light', monthlyGive ? 'btn-danger' : 'disabled']"
                                                 @click="openSurplusActivityDialog1()">
                                                 <text v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text>
                                             </view>
@@ -154,24 +154,23 @@
                                         <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' : 'disabled']"
+                                                :class="['btn btn-dark waves-effect waves-light', surplusGive ? 'btn-danger' : 'disabled']"
                                                 @click="openSurplusActivityDialog()">
                                                 <text v-t="'news_add_field1.activities10_trading_aoyun.item3'"></text>
                                             </view>
-                                            <cwg-link type="pdf"
-                                                class="btn btn-outline-dark1 mb-3 waves-effect waves-light"
+                                            <cwg-link type="pdf" class="btn btn-outline-dark1 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-dark1 mb-3 waves-effect waves-light"
-                                                target="_blank" title="Transfer.item7"
+                                                class="btn btn-outline-dark1 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-dark1 mb-3 waves-effect waves-light"
-                                                target="_blank" title="Transfer.item7"
+                                                class="btn btn-outline-dark1 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-dark1 mb-3 waves-effect waves-light"
+                                            <view class="btn btn-outline-dark1 waves-effect waves-light"
                                                 @click="goSurplusTaskList()">
                                                 <text v-t="'wallet.item14'"></text>
                                             </view>
@@ -208,7 +207,7 @@
                                                 v-if="tableDataCpt.signStatus == 0" @click="toApplyCptOpen()">
                                                 <text v-t="'news_add_field1.activitiesJYDS.item3'"></text>
                                             </view>
-                                            <view class="btn disabled  waves-effect waves-light"
+                                            <view class="btn btn-dark waves-effect waves-light"
                                                 v-if="tableDataCpt.signStatus == 1">
                                                 <text v-t="'news_add_field1.activitiesJYDS.item3_1'"></text>
                                             </view>
@@ -249,7 +248,7 @@
                                         <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' : 'disabled']"
+                                                :class="['btn btn-dark waves-effect waves-light', item.valid == 1 ? 'btn-danger' : 'disabled']"
                                                 @click="toActivity24nianzhong()">
                                                 <text v-t="'Custom.Activity.Apply'"></text>
                                             </view>
@@ -286,17 +285,17 @@
                                         <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' : 'disabled']"
+                                                :class="['btn btn-dark waves-effect waves-light', overdue(item.startTime, item.endTime) ? 'btn-danger' : 'disabled']"
                                                 @click="applications(item)">
                                                 <text v-t="'Custom.Activity.Apply'"></text>
                                             </view>
                                             <view type="submit" value="Submit"
-                                                class="btn btn-outline-dark1 mb-3 waves-effect waves-light"
+                                                class="btn btn-outline-dark1 waves-effect waves-light"
                                                 @click="checkActivity(item)">
                                                 <text v-t="'Custom.Activity.List'"></text>
                                             </view>
                                             <view type="submit" value="Submit"
-                                                class="btn btn-outline-dark1 mb-3 waves-effect waves-light"
+                                                class="btn btn-outline-dark1 waves-effect waves-light"
                                                 @click="toSingle(item.id)">
                                                 <text v-t="'Custom.Activity.Single'"></text>
                                             </view>
@@ -736,13 +735,13 @@
                 <button type="primary" @click="confirmSurplusActivity1">{{ t('Btn.Confirm') }}</button>
             </template>
         </cwg-popup>
-        <cwg-confirm-popup />
+        <cwg-confirm-popup v-if="showPage" />
     </cwg-page-wrapper>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted, onUnmounted, watch } from 'vue'
-import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+import { ref, reactive, computed, onMounted, onUnmounted, watch, nextTick } from 'vue'
+import { onShow, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
 import ActivityCard from './components/ActivityCard.vue'
 import ActivityDialogs from './components/ActivityDialogs.vue'
@@ -756,6 +755,7 @@ import { useConfirm } from '@/hooks/useConfirm'
 const confirm = useConfirm()
 const { t, locale } = useI18n()
 let { Code, Host05 } = Config
+const showPage = ref(false)
 
 // 国家列表
 const countries = [
@@ -2034,7 +2034,7 @@ const getActivityShowsInfo = async () => {
 
 // 打开surplus活动弹框
 const openSurplusActivityDialog = async () => {
-  console.log(surplusGive.value)
+    console.log(surplusGive.value)
     if (!surplusGive.value) {
         return
     }
@@ -2452,11 +2452,14 @@ onUnmounted(() => {
     }
 })
 
-// UniApp 页面生命周期
-onLoad((options) => {
-    // 页面加载时的逻辑
+onShow(async (options) => {
+    showPage.value = false
+    await nextTick()
+    setTimeout(async () => {
+        showPage.value = true
+        await nextTick()
+    }, 100)
 })
-
 onPullDownRefresh(() => {
     // 下拉刷新
     searchFunc()
@@ -2517,7 +2520,8 @@ onReachBottom(() => {
         }
     }
 }
-.btn-outline-dark1{
+
+.btn-outline-dark1 {
     background-color: var(--btn-color) !important;
     color: var(--bs-emphasis-color) !important;
 }

pages/activities/monthly-list.vue

@@ -77,13 +77,12 @@
                             </view>
                             <view class="data-card btn-card" v-show="shouldShowCard(item, item)">
                                 <!-- 取消按钮 - status为1时显示 -->
-                                <button v-if="item.status === 1" type="danger" size="small" @click="cancelTask(item.id)"
+                                <button v-if="item.status === 1" class="btn btn-dark btn-sm waves-effect waves-light btn-outline-dark1" @click="cancelTask(item.id)"
                                     :loading="loadingStates[item.id] === 'cancel'">
                                     {{ t("Btn.Cancel") }}
                                 </button>
                                 <!-- 礼物申请按钮 - status为2且giveStatus为1时显示 -->
-                                <button v-if="item.status === 2 && item.giveStatus === 1 && lang1" type="primary"
-                                    size="small" @click="applyGift(item.id)"
+                                <button class="btn btn-primary btn-sm waves-effect waves-light" v-if="item.status === 2 && item.giveStatus === 1 && lang1" @click="applyGift(item.id)"
                                     :loading="loadingStates[item.id] === 'applyGift'">
                                     {{ t("Btn.Application") }}
                                 </button>

pages/activities/surplus-list.vue

@@ -81,11 +81,11 @@
                                 </view>
                             </view>
                             <view class="data-card" v-show="shouldShowCard(item, item)">
-                                <button v-if="item.status === 1 && item.revokeCredit === 2" type="primary" size="small"
+                                <button class="btn btn-primary waves-effect waves-light"  v-if="item.status === 1 && item.revokeCredit === 2" type="primary" size="small"
                                     @click="completeTask(item.id)" :loading="loadingStates[item.id] === 'complete'">
                                     {{ t("surplusList.item7") }}
                                 </button>
-                                <button v-if="item.status === 1" type="danger" size="small" @click="cancelTask(item.id)"
+                                <button class="btn btn-dark waves-effect waves-light btn-outline-dark1"  v-if="item.status === 1" @click="cancelTask(item.id)"
                                     :loading="loadingStates[item.id] === 'cancel'">
                                     {{ t("Btn.Cancel") }}
                                 </button>
@@ -100,7 +100,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch } from 'vue'
+import { ref, computed, onMounted, watch, onUnmounted } from 'vue'
 import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
 import { activityApi } from "@/service/activity"
@@ -308,6 +308,10 @@ onMounted(() => {
     searchFunc()
 })
 
+onUnmounted(() => {
+    searchFunc()
+})
+
 // 原 watch（保留）
 watch(
     () => search.value.type,

pages/customer/components/AccountList.vue

@@ -118,7 +118,7 @@ const isGridLayout = ref(true)
 const tabs = computed(() => ([
     { value: 'real', text: t('vu.item1') },
     { value: 'demo', text: t('vu.item2') },
-    { value: 'del', text: t('Tips.DeleteAccount') },
+    // { value: 'del', text: t('Tips.DeleteAccount') },
 ]))
 
 const toggleLayout = () => {

static/scss/global/global.scss

@@ -1640,7 +1640,7 @@ uni-content.collapsed {
     &:hover {
         color: #000;
         background-color: var(--btn-color);
-        border-color:var(--btn-color);
+        border-color: var(--btn-color);
     }
 
     // 添加点击效果
@@ -1964,4 +1964,9 @@ uni-content.collapsed {
 .btn-outline-dark1 {
     background-color: var(--btn-color) !important;
     color: var(--bs-emphasis-color) !important;
+}
+
+.add-btn {
+    font-weight: 600;
+    text-decoration: underline;
 }