zhb 1 week ago
parent
commit
887e9fe558

+ 1 - 1
components/cwg-tabel.vue

@@ -42,7 +42,7 @@
                         <cwg-droplist v-if="getComputedMenuList(column.menuList, row).length > 0"
                                       :menuList="getComputedMenuList(column.menuList, row)" placement="bottom-end"
                                       @menuClick="(payload) => handleActionClick(payload, row)">
-                          <view class="action-trigger">
+                          <view class="action-trigger cursor-pointer" :data-tooltip="t('Btn.More')">
                             <cwg-icon name="crm-ellipsis" :size="24" />
                           </view>
                         </cwg-droplist>

+ 13 - 87
pages/activities/index.vue

@@ -14,80 +14,6 @@
             </view>
             <view class="col-xxl-12 mb-4" v-if="!pictLoading">
                 <view class="row">
-                    <!-- <view class="col-12 m-b30">
-                        <view class="card card-action action-elevate action-border-primary">
-                            <view class="row g-0">
-                                <view class="col-md-4">
-                                    <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
-                                        <image src="/static/images/vu/promotion-1.jpg" alt=""
-                                            class="img-fluid rounded" mode="widthFix" />
-                                        <view
-                                            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">
-                                                →</a>
-                                        </view>
-                                    </view>
-                                </view>
-                                <view class="col-md-8 py-3 d-flex flex-column">
-                                    <view class="card-body px-3 py-2"> <a href="#"
-                                            class="badge badge-sm bg-secondary mb-1">28 Apr, 2026</a>
-                                        <h4> <a href="#" class="text-dark">Monthly Trading Challenge</a> </h4>
-                                        <view>Complete Trading Targets · Enjoy Multi-Tier Exclusive Gifts</view>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-danger mb-3 waves-effect waves-light">Join Now</button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Event
-                                            Terms</button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Participation
-                                            Method</button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Mission
-                                            List</button>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="col-12 m-b30">
-                        <view class="card card-action action-elevate action-border-primary">
-                            <view class="row g-0">
-                                <view class="col-md-4">
-                                    <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
-                                        <image src="/static/images/vu/promotion.png" alt="" class="img-fluid rounded" mode="widthFix" />
-                                        <view
-                                            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">
-                                                →</a>
-                                        </view>
-                                    </view>
-                                </view>
-                                <view class="col-md-8 py-3 d-flex flex-column">
-                                    <view class="card-body px-3 py-2"><a href="#"
-                                            class="badge badge-sm bg-secondary mb-1">28 Apr, 2026</a>
-                                        <h4> <a href="#" class="text-dark">CWG Monthly Premium Bonus</a> </h4>
-                                        <view>Deposit now to receive generous bonuses of up to $5000! The more you
-                                            deposit,
-                                            the higher the reward, making every investment more valuable!</view>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-danger mb-3 waves-effect waves-light">Join Now</button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Event
-                                            Terms</button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Participation
-                                            Method</button>
-                                        <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Mission
-                                            List</button>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </view> -->
-
                     <!-- 月度活动 -->
                     <view class="col-12 m-b30" v-if="country == 'CN'">
                         <view class="card card-action action-elevate action-border-primary">
@@ -98,9 +24,9 @@
                                             mode="widthFix" />
                                         <view
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-opacity-50 rounded d-flex align-items-center justify-content-center">
-                                            <a @click="openSurplusActivityDialog1()"
+                                            <view @click="openSurplusActivityDialog1()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                →</a>
+                                                →</view>
                                         </view>
                                     </view>
                                 </view>
@@ -141,9 +67,9 @@
                                             mode="widthFix" />
                                         <view
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-opacity-50 rounded d-flex align-items-center justify-content-center">
-                                            <a @click="openSurplusActivityDialog()"
+                                            <view @click="openSurplusActivityDialog()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                →</a>
+                                                →</view>
                                         </view>
                                     </view>
                                 </view>
@@ -238,9 +164,9 @@
                                             mode="widthFix" />
                                         <view
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100 bg-opacity-50 rounded d-flex align-items-center justify-content-center">
-                                            <a @click="toSingle('NoWorries')"
+                                            <view @click="toSingle('NoWorries')"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                →</a>
+                                                →</view>
                                         </view>
                                     </view>
                                 </view>
@@ -282,9 +208,9 @@
                                             mode="widthFix" />
                                         <view
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100  bg-opacity-50 rounded d-flex align-items-center justify-content-center">
-                                            <a @click="toApplyCptOpen()"
+                                            <view @click="toApplyCptOpen()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                →</a>
+                                                →</view>
                                         </view>
                                     </view>
                                 </view>
@@ -329,9 +255,9 @@
                                             mode="widthFix" />
                                         <view
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100  bg-opacity-50 rounded d-flex align-items-center justify-content-center">
-                                            <a @click="toActivity24nianzhong()"
+                                            <view @click="toActivity24nianzhong()"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                →</a>
+                                                →</view>
                                         </view>
                                     </view>
                                 </view>
@@ -366,9 +292,9 @@
                                             mode="widthFix" />
                                         <view
                                             class="position-absolute action-visible top-0 start-0 h-100 w-100  bg-opacity-50 rounded d-flex align-items-center justify-content-center">
-                                            <a @click="applications(item)"
+                                            <view @click="applications(item)"
                                                 class="btn btn-icon btn-lg btn-secondary rounded-circle waves-effect waves-light">
-                                                →</a>
+                                                →</view>
                                         </view>
                                     </view>
                                 </view>
@@ -987,7 +913,7 @@ const search = reactive({
     type: 1,
 })
 //分页
-const pagerInfo = reactive({ row: 10, current: 1, pageTotal: 0, rowTotal: 0 })
+const pagerInfo = reactive({ row: 100, current: 1, pageTotal: 0, rowTotal: 0 })
 const tableDataGive = ref<any[]>([])
 
 // 验证规则

+ 0 - 26
pages/analytics/components/List.vue

@@ -1,30 +1,5 @@
 <template>
   <view class="tab-content">
-
-    <!-- <view class="col-12 m-b30">
-      <view class="card card-action action-elevate action-border-primary">
-        <view class="row g-0">
-          <view class="col-md-3">
-            <view class="card-header border-0 p-0 m-2 position-relative overflow-hidden">
-              <image src="/static/images/vu/news.jpg" alt="" class="img-fluid rounded" mode="widthFix" />
-            </view>
-          </view>
-          <view class="col-md-9 py-3 d-flex flex-column">
-            <view class="card-body px-3 py-2">
-              <a href="-" class="badge badge-sm bg-danger mb-1">Trading</a>
-              <h4><span class="text-2xs text-body"><i class="icon-calendar text-primary"></i> 2025-03-24 l
-                  10:30 AM</span><br>
-                <a href="-" class="text-dark">Dollar Index (ICE) Intraday:
-                  caution</a>
-              </h4>
-              <p>We are thrilled to announce that CWG Markets has been honored
-                with the prestigious title of Leading Financial Services..</p>
-            </view>
-
-          </view>
-        </view>
-      </view>
-    </view> -->
     <!-- 列表 -->
     <view v-if="list.length > 0" class="list">
       <view v-for="item in list" :key="item.id" class="col-12 m-b30">
@@ -39,7 +14,6 @@
             </view>
             <view class="col-md-9 py-3 d-flex flex-column">
               <view class="card-body px-3 py-2">
-                <!-- <a href="#" class="badge badge-sm bg-danger mb-1">Trading</a> -->
                 <h5>
                   <span class="text-2xs text-body p-text"><i class="icon-calendar text-primary"></i> {{
                     formatDate(item.deliveryTime) }}</span><br>

+ 4 - 6
pages/follow/trading-center.vue

@@ -41,9 +41,9 @@
 
         <!-- 订阅 -->
         <template #subscribe="{ row }">
-          <button class="btn-primary" size="mini" @click="toSubscribe(row)">
+          <view class="btn-primary" size="mini" @click="toSubscribe(row)">
             <text>{{ t('Documentary.tradingCenter.item25') }}</text>
-          </button>
+          </view>
         </template>
       </cwg-tabel>
     </view>
@@ -614,15 +614,13 @@ const applyFllowCancel = () => {
 }
 
 .btn-primary {
+  min-width: px2rpx(50);
   background-color: #4497ff;
   color: white;
   padding: 0 px2rpx(12);
   border: none;
   font-size: px2rpx(12);
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: px2rpx(4);
+  display: block;
   height: 28px;
   line-height: 28px;
   border-radius: 4px;