1

pages/activities/content.vue

@@ -1,9 +1,7 @@
 <template>
     <cwg-page-wrapper class="create-page" :isHeaderFixed="true">
         <view class="info-card">
-            <view class="content-title">
-                <view v-t="'Custom.Activity.Single'" />
-            </view>
+            <cwg-header :title="t('Custom.Activity.Single')" />
             <view id="News_Content">
 
                 <view class="content crm-border-radius" v-if="!ActivitySingle20 &&

pages/activities/index.vue

@@ -142,6 +142,37 @@
                                     </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="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-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>
+                                </view>
+                            </view> -->
                         </view>
                         <!-- 加载更多状态 -->
                         <view v-if="loadingMore" class="loading-more">
@@ -463,7 +494,8 @@
             </template>
         </cwg-popup>
 
-        <!-- Surplus活动弹框 -->
+        <!-- 现在有的活动 -->
+        <!-- 11111111Surplus活动弹框 -->
         <cwg-popup v-model:visible="dialogSurplusActivity" :title="t('surplusList.item1')" type="center"
             :mask-click="false" :show-footers="true" width="600px">
             <view class="dia-content">
@@ -491,13 +523,12 @@
                 </button>
             </template>
         </cwg-popup>
-
-        <!-- 月赏礼遇活动弹框 -->
+        <!-- 111111月赏礼遇活动弹框 -->
         <cwg-popup v-model:visible="dialogSurplusActivity1" :title="t('MonthlyActivities.item1')" type="center"
             :mask-click="false" :show-footers="true" width="600px">
             <view class="dia-content">
                 <view class="content" style="padding: 20px; font-size: 16px">
-                    <strong v-html="t('MonthlyActivities.item8')"></strong>
+                    <strong v-t="'MonthlyActivities.item8'"></strong>
                 </view>
             </view>
             <template #footer>
@@ -517,15 +548,11 @@ import ActivityDialogs from './components/ActivityDialogs.vue'
 import { activityApi } from "@/service/activity"
 import { customApi } from "@/service/custom"
 import Config from '@/config/index'
-// import Drawer from "@/views/global/Drawer"
-// import DrawLotteryRaffle from "@/views/customer/DrawLotteryRaffle"
-// import ActivitiesContent from "@/views/customer/ActivitiesContent24"
 import useUserStore from "@/stores/use-user-store";
 const userStore = useUserStore();
 import { isAfterJuly28 } from "@/utils/dateUtils"
 import { useConfirm } from '@/hooks/useConfirm'
 
-const confirm = useConfirm()
 const { t, locale } = useI18n()
 let { Code, Host05 } = Config
 
@@ -1883,16 +1910,21 @@ const closeSurplusActivityDialog1 = () => {
     valueInfo.value = null
 }
 
+// 确认参加月度豪礼活动
 const confirmSurplusActivity1 = async () => {
-    surplusActivityLoading1.value = true
-    let res = await activityApi.ActivityMonthlyAdd({})
-    if (res.code == Code.StatusOK) {
-        uni.showToast({ title: res.msg, icon: "success" })
-        closeSurplusActivityDialog1()
-        surplusActivityLoading1.value = false
-        getActivityShowsInfo()
-    } else {
-        uni.showToast({ title: res.msg, icon: "none" })
+    try {
+        surplusActivityLoading1.value = true
+        let res = await activityApi.ActivityMonthlyAdd({})
+        if (res.code == Code.StatusOK) {
+            uni.showToast({ title: res.msg, icon: "success" })
+            closeSurplusActivityDialog1()
+            surplusActivityLoading1.value = false
+            getActivityShowsInfo()
+        } else {
+            uni.showToast({ title: res.msg, icon: "none" })
+        }
+    } catch (error) {
+        uni.showToast({ title: error?.msg, icon: "none" })
     }
 }
 
@@ -1962,44 +1994,44 @@ const toSingle = (id: string, listID?: string) => {
     ) {
         if (id == "23jx") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}&data1=${tableData3.value.show ? tableData3.value.activityStartTime : tableData3.value.showActivityStartTime}&data2=${tableData3.value.show ? tableData3.value.activityEndTime : tableData3.value.showActivityEndTime}&data3=${tableData3.value.show ? tableData3.value.applicationStartTime : tableData3.value.showApplicationStartTime}&data4=${tableData3.value.show ? tableData3.value.applicationEndTime : tableData3.value.showApplicationEndTime}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}&data1=${tableData3.value.show ? tableData3.value.activityStartTime : tableData3.value.showActivityStartTime}&data2=${tableData3.value.show ? tableData3.value.activityEndTime : tableData3.value.showActivityEndTime}&data3=${tableData3.value.show ? tableData3.value.applicationStartTime : tableData3.value.showApplicationStartTime}&data4=${tableData3.value.show ? tableData3.value.applicationEndTime : tableData3.value.showApplicationEndTime}`,
             })
         } else if (id == "23jxVip") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}&data1=${tableData3Vip.value.show ? tableData3Vip.value.activityStartTime : tableData3Vip.value.showActivityStartTime}&data2=${tableData3Vip.value.show ? tableData3Vip.value.activityEndTime : tableData3Vip.value.showActivityEndTime}&data3=${tableData3Vip.value.show ? tableData3Vip.value.applicationStartTime : tableData3Vip.value.showApplicationStartTime}&data4=${tableData3Vip.value.show ? tableData3Vip.value.applicationEndTime : tableData3Vip.value.showApplicationEndTime}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}&data1=${tableData3Vip.value.show ? tableData3Vip.value.activityStartTime : tableData3Vip.value.showActivityStartTime}&data2=${tableData3Vip.value.show ? tableData3Vip.value.activityEndTime : tableData3Vip.value.showActivityEndTime}&data3=${tableData3Vip.value.show ? tableData3Vip.value.applicationStartTime : tableData3Vip.value.showApplicationStartTime}&data4=${tableData3Vip.value.show ? tableData3Vip.value.applicationEndTime : tableData3Vip.value.showApplicationEndTime}`,
             })
         } else if (id == "24JYB") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}&data1=${tableData3JYB.value.show ? tableData3JYB.value.activityStartTime : tableData3JYB.value.showActivityStartTime}&data2=${tableData3JYB.value.show ? tableData3JYB.value.activityEndTime : tableData3JYB.value.showActivityEndTime}&data3=${tableData3JYB.value.show ? tableData3JYB.value.applicationStartTime : tableData3JYB.value.showApplicationStartTime}&data4=${tableData3JYB.value.show ? tableData3JYB.value.applicationEndTime : tableData3JYB.value.showApplicationEndTime}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}&data1=${tableData3JYB.value.show ? tableData3JYB.value.activityStartTime : tableData3JYB.value.showActivityStartTime}&data2=${tableData3JYB.value.show ? tableData3JYB.value.activityEndTime : tableData3JYB.value.showActivityEndTime}&data3=${tableData3JYB.value.show ? tableData3JYB.value.applicationStartTime : tableData3JYB.value.showApplicationStartTime}&data4=${tableData3JYB.value.show ? tableData3JYB.value.applicationEndTime : tableData3JYB.value.showApplicationEndTime}`,
             })
         } else if (id == "23nz") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}&data3=${tableData4.value.show ? tableData4.value.applicationStartTime : tableData4.value.showApplicationStartTime}&data4=${tableData4.value.show ? tableData4.value.applicationEndTime : tableData4.value.showApplicationEndTime}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}&data3=${tableData4.value.show ? tableData4.value.applicationStartTime : tableData4.value.showApplicationStartTime}&data4=${tableData4.value.show ? tableData4.value.applicationEndTime : tableData4.value.showApplicationEndTime}`,
             })
         } else if (id == "23nzTwo") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}&data3=${tableData4Two.value.show ? timeConvert(tableData4Two.value.applicationStartTime) : timeConvert(tableData4Two.value.showApplicationStartTime)}&data4=${tableData4Two.value.show ? timeConvert(tableData4Two.value.applicationEndTime) : timeConvert(tableData4Two.value.showApplicationEndTime)}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}&data3=${tableData4Two.value.show ? timeConvert(tableData4Two.value.applicationStartTime) : timeConvert(tableData4Two.value.showApplicationStartTime)}&data4=${tableData4Two.value.show ? timeConvert(tableData4Two.value.applicationEndTime) : timeConvert(tableData4Two.value.showApplicationEndTime)}`,
             })
         } else if (id == "NoWorries") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}`,
             })
         } else if (id == "NewYear24") {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}`,
             })
         } else {
             uni.navigateTo({
-                url: `/pages/activities/content/index?id=&type=1&active=${id}`,
+                url: `/pages/activities/content?id=&type=1&active=${id}`,
             })
         }
     } else if (id == "newList") {
         uni.navigateTo({
-            url: `/pages/activities/content/index?id=${listID}&type=1&active=newList`,
+            url: `/pages/activities/content?id=${listID}&type=1&active=newList`,
         })
     } else {
         uni.navigateTo({
-            url: `/pages/activities/content/index?id=${id}&type=1`,
+            url: `/pages/activities/content?id=${id}&type=1`,
         })
     }
 }
@@ -2245,26 +2277,46 @@ onReachBottom(() => {
             color: #eb3f57;
         }
     }
+
 }
-</style>
 
-<style lang="scss" scoped>
-#custom_activities {
-    .dialog_header_w.dialogNewTask {
-        .el-dialog__header {
-            font-weight: bold;
-        }
+
+// 弹窗样式优化
+.dia-content {
+    padding: 11px;
+    height: 400px;
+
+
+    .content {
+        padding: 20px !important;
     }
 
-    .dialog_header_w.dialogNewTaskcj {
-        border-radius: 10px;
+    .form-item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 20px;
+        gap: 16px;
 
-        .el-dialog__header {
-            padding-top: 30px;
+        .form-label {
+            width: 120px;
+            font-weight: 500;
+            color: #333;
+            font-size: 14px;
+        }
 
-            .el-dialog__title {
-                font-weight: bold;
-                font-size: 28px;
+        :deep(.cwg-combox) {
+            flex: 1;
+            min-width: 300px;
+
+            .el-input__wrapper {
+                border-radius: 4px;
+            }
+
+            &.disabled {
+                .el-input__wrapper {
+                    background-color: #f5f5f5;
+                    cursor: not-allowed;
+                }
             }
         }
     }

pages/activities/monthly-list.vue

@@ -273,7 +273,7 @@ const completeTask = async (id: number) => {
         try {
             const res = await activityApi.ActivitySurplusRecoverCredit({ id })
             if (res.code == Code.StatusOK) {
-                uni.showToast({ title: t("Msg.Success"), icon: "success" })
+                // uni.showToast({ title: t("Msg.Success"), icon: "success" })
                 searchFunc()
             } else {
                 uni.showToast({ title: res.msg, icon: "none" })
@@ -398,7 +398,7 @@ const submitGiftApply = async (form) => {
             givePhone: form.givePhone.trim(),
         })
         if (res.code == Code.StatusOK) {
-            uni.showToast({ title: t("Msg.Success"), icon: "success" })
+            // uni.showToast({ title: t("Msg.Success"), icon: "success" })
             dialogGiftApplication.value = false
             searchFunc()
         } else {
@@ -448,7 +448,7 @@ const searchFunc = async () => {
     if (res.code == Code.StatusOK) {
         tableData.value = res.data
         calculateCardData()
-        uni.showToast({ title: t("Msg.SearchSuccess"), icon: "success" })
+        // uni.showToast({ title: t("Msg.SearchSuccess"), icon: "success" })
         pictLoading.value = false
         flag.value = false
     } else {

pages/customer/create-account.vue

@@ -29,7 +29,7 @@
                         <!-- 杠杆 -->
                         <uni-col :xs="24">
                             <uni-forms-item :label="t('Custom.NewAccount.Lever')" name="leverage">
-                                <cwg-combox :clearable="false" :disabled="hidden" v-model:value="formData.leverage"
+                                <cwg-combox :clearable="false" v-model:value="formData.leverage"
                                     :options="leverageColumns" :placeholder="t('placeholder.choose')" />
                             </uni-forms-item>
                         </uni-col>
@@ -85,7 +85,7 @@
                     <view class="info-value">{{ currentAccount?.maxLeverage || '--' }}</view>
                 </view>
                 <view class="info-row">
-                    <view class="info-value"><cwg-link type="pdf" title="news_add_field.OpenAccount.Des2"
+                    <view class="info-value link-item"><cwg-link type="pdf" title="news_add_field.OpenAccount.Des2"
                             url="pdf/PrivacyPolicy2019_01.pdf" target="_blank" /></view>
                 </view>
             </view>
@@ -249,6 +249,9 @@ const resetForm = async () => {
     formData.leverage = ""
     formData.platform = ""
     formData.balance = ""
+    optionsLev.value = []
+    optionsCur.value = []
+    showData.value = null
     amountErrorMessage.value = ""
     submitting.value = false
     flag.value = false
@@ -818,6 +821,19 @@ onMounted(() => {
             font-weight: 500;
             color: #1e2a3a;
         }
+
+        .link-item {
+            line-height: px2rpx(20);
+            font-size: px2rpx(12);
+            letter-spacing: px2rpx(0.5);
+            color: #0066cc;
+            text-decoration: underline;
+            cursor: pointer;
+
+            &:active {
+                opacity: 0.7;
+            }
+        }
     }
 
     .link-wrapper {