zhb il y a 1 mois
Parent
commit
d21e84e52e

+ 22 - 18
pages/activities/index.vue

@@ -37,13 +37,13 @@
                                         <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-dark mb-3 waves-effect waves-light">Event
+                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Event
                                             Terms</button>
                                         <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light">Participation
+                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Participation
                                             Method</button>
                                         <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light">Mission
+                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Mission
                                             List</button>
                                     </view>
                                 </view>
@@ -74,13 +74,13 @@
                                         <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-dark mb-3 waves-effect waves-light">Event
+                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Event
                                             Terms</button>
                                         <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light">Participation
+                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Participation
                                             Method</button>
                                         <button type="submit" value="Submit"
-                                            class="btn btn-outline-dark mb-3 waves-effect waves-light">Mission
+                                            class="btn btn-outline-dark1 mb-3 waves-effect waves-light">Mission
                                             List</button>
                                     </view>
                                 </view>
@@ -115,13 +115,13 @@
                                                 @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"
+                                            <cwg-link type="pdf" class="btn btn-outline-dark1 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"
+                                            <cwg-link type="pdf" class="btn btn-outline-dark1 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"
+                                            <view class="btn btn-outline-dark1 waves-effect waves-light"
                                                 @click="goMonthlyTaskList()">
                                                 <text v-t="'wallet.item14'"></text>
                                             </view>
@@ -159,19 +159,19 @@
                                                 <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"
+                                                class="btn btn-outline-dark1 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"
+                                                class="btn btn-outline-dark1 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"
+                                                class="btn btn-outline-dark1 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"
+                                            <view class="btn btn-outline-dark1 mb-3 waves-effect waves-light"
                                                 @click="goSurplusTaskList()">
                                                 <text v-t="'wallet.item14'"></text>
                                             </view>
@@ -212,11 +212,11 @@
                                                 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"
+                                            <view class="btn btn-outline-dark1  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"
+                                            <view class="btn btn-outline-dark1  waves-effect waves-light"
                                                 @click="toOpenSingle(tableDataCpt.pageAddress)">
                                                 <text v-t="'news_add_field1.activitiesJYDS.item4_1'"></text>
                                             </view>
@@ -253,7 +253,7 @@
                                                 @click="toActivity24nianzhong()">
                                                 <text v-t="'Custom.Activity.Apply'"></text>
                                             </view>
-                                            <view class="btn btn-outline-dark  waves-effect waves-light"
+                                            <view class="btn btn-outline-dark1  waves-effect waves-light"
                                                 @click="toSingle('newList', item.id)">
                                                 <text v-t="'Custom.Activity.Single'"></text>
                                             </view>
@@ -291,12 +291,12 @@
                                                 <text v-t="'Custom.Activity.Apply'"></text>
                                             </view>
                                             <view type="submit" value="Submit"
-                                                class="btn btn-outline-dark mb-3 waves-effect waves-light"
+                                                class="btn btn-outline-dark1 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"
+                                                class="btn btn-outline-dark1 mb-3 waves-effect waves-light"
                                                 @click="toSingle(item.id)">
                                                 <text v-t="'Custom.Activity.Single'"></text>
                                             </view>
@@ -2517,6 +2517,10 @@ onReachBottom(() => {
         }
     }
 }
+.btn-outline-dark1{
+    background-color: var(--btn-color) !important;
+    color: var(--bs-emphasis-color) !important;
+}
 
 .surplusActivityDialog {
     height: 300px;

+ 13 - 3
pages/customer/components/AccountCard.vue

@@ -23,7 +23,7 @@
                         account.accountNumber }}</h5>
                     <h4 class="mb-2 cursor-pointer" @click="copy(account.fwq)">{{ account.fwq }}</h4>
                     <template v-for="(label, index) in account.labels" :key="index">
-                        <text v-if="label" class="badge bg-danger-subtle mx-1">{{ label }}</text>
+                        <text v-if="label" class="badge text-danger1 bg-danger-subtle mx-1">{{ label }}</text>
                     </template>
                     <h1 class="mt-2">${{ balanceInteger }}{{ balanceDecimal }}</h1>
                     <!-- <button type="submit" value="Submit" class="btn btn-secondary btn-sm w-75 waves-effect waves-light"
@@ -70,9 +70,9 @@
                         <view class="d-flex flex-wrap gap-2" v-if="isReal">
                             <button v-for="btn in actionButtons" :key="btn.key" type="submit" value="Submit"
                                 class="btn btn-dark btn-sm waves-effect waves-light"
-                                :class="{ 'disabled': btn.disabled.value }" @click="handleAction(btn.action)">
+                                :class="{ 'disabled': btn.disabled, 'btn-outline-dark1': btn.key !== 'deposit'}" @click="handleAction(btn.action)">
                                 <view class="d-flex align-items-center justify-content-center gap-1">
-                                    <cwg-icon :name="btn.icon" :size="14" color="#fff" />
+                                    <cwg-icon :name="btn.icon" :size="14" :color="btn.key === 'deposit' ? '#fff' : ''" />
                                     {{ t(btn.label) }}
                                 </view>
                             </button>
@@ -299,4 +299,14 @@ onBeforeUnmount(() => {
     margin-left: 0;
     margin-right: 0;
 }
+
+.text-danger1 {
+    color: var(--bs-emphasis-color) !important;
+}
+
+.btn-outline-dark1 {
+    background-color: var(--btn-color) !important;
+    color: var(--bs-emphasis-color) !important;
+    border-color: var(--btn-color) !important;
+}
 </style>

Fichier diff supprimé car celui-ci est trop grand
+ 655 - 274
pages/ib/withdraw.vue


+ 1 - 1
static/scss/global/vu.css

@@ -4929,7 +4929,7 @@ textarea.form-control-lg {
   padding: var(--bs-badge-padding-y) var(--bs-badge-padding-x);
   font-size: var(--bs-badge-font-size);
   line-height: 1;
-  color: var(--bs-emphasis-color);
+  color: var(--bs-body-bg);
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff