feat: 修改

components/cwg-error-popup.vue

@@ -1,5 +1,5 @@
 <template>
-    <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :show-footers="true">
+    <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :show-footers="true" @close="closeDia">
         <view class="popup-content">
             <view class="icon"><cwg-icon name="gy" :size="80" color="#eb3f57" /></view>
             <view class="des1">{{ responseMessage }}</view>

components/cwg-popup.vue

@@ -1,5 +1,5 @@
 <template>
-    <uni-popup ref="popupRef" type="center" @change="handlePopupChange" class="crm-popup" @maskClick="closeDialog">
+    <uni-popup ref="popupRef" type="center" @change="handlePopupChange" class="crm-popup" @maskClick="closeDialog" :isMaskClick="maskClick">
         <view class="cwg-dialog" :style="{ width: width }">
             <!-- 弹窗头部 -->
             <view class="dialog-header" v-if="title">
@@ -129,6 +129,11 @@ const props = defineProps({
         type: String,
         default: '600px'
     },
+    // 遮罩层点击
+    maskClick: {
+        type: Boolean,
+        default: true
+    },
     // 分页信息（传递给父组件使用）
     pagerInfo: {
         type: Object,

pages/customer/components/CheckPopup.vue

@@ -1,5 +1,5 @@
 <template>
-  <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :showFooters="true" :showClose="false">
+  <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :showFooters="true" :showClose="false" @close="close">
     <view class="popup-content">
       <view class="icon">
         <cwg-icon name="loading" :size="64" color="#1e2a3a" />

pages/customer/components/DepositCheckConfirmPopup.vue

@@ -1,6 +1,6 @@
 <template>
   <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :showFooters="true" :showClose="false"
-    :title="t('Home.page_customer.item2')">
+    :title="t('Home.page_customer.item2')" @close="cancel" >
     <view class="popup-content">
       <view class="info-section">
         <cwg-label-line-value :label="t('Custom.Deposit.Title1')" :value="loginDoc" v-if="loginDoc" />

pages/customer/components/digitalPayConfirmPopup.vue

@@ -1,6 +1,6 @@
 <template>
     <cwg-popup v-model:visible="visible" type="center" :mask-click="false" :showFooters="true"
-        :title="t('Custom.Deposit.DigitalAcc')">
+        :title="t('Custom.Deposit.DigitalAcc')" @close="close">
         <view class="popup-content">
             <view class="dia-content digital-pay-confirm-body">
                 <view class="digital-pay-info">

pages/customer/create-account.vue

@@ -757,6 +757,7 @@ onMounted(() => {
 .notice-list {
     // margin: px2rpx(10) 0;
     padding: 0 px2rpx(12) px2rpx(12) 0;
+  color: var(--bs-emphasis-color);
 
     .notice-item {
         font-size: px2rpx(14);

pages/customer/dashboard.vue

@@ -42,7 +42,7 @@
             <view class="card position-relative">
               <view class="card-body d-flex align-items-center gap-3">
                 <view class="icon-placeholder">
-                  <cwg-icon name="crm-money-up" :size="14" color="red" />
+                  <cwg-icon name="crm-money-up" :size="28" color="red" />
                 </view>
                 <view class="flex-1">
                   <view class="d-flex justify-between items-start mb-1">

pages/customer/deposit.vue

@@ -33,7 +33,7 @@
                                         <h5 class="mb-3" v-t="'Custom.Deposit.Title2'"></h5>
                                         <uni-forms-item>
                                             <cwg-combox :clearable="false" v-model:value="channelId"
-                                                :options="channelListOptions" :placeholder="t('placeholder.choose')">
+                                                :options="channelListOptions" :placeholder="t('placeholder.choose')" needSpace>
                                             </cwg-combox></uni-forms-item>
                                     </view>
 
@@ -606,6 +606,7 @@ const resetForm = () => {
     amountErrorMessage.value = ""
     requiteVoucherUrl.value = ""
     imageUrl.value = ""
+  hashCode.value = ''
     imageUrl1.value = ""
 }
 const formRef = ref(null)
@@ -1476,7 +1477,7 @@ const closeErrorDia = () => {
 }
 const closeDia = () => {
     closeErrorDia()
-    showTable()
+    showTable(false)
 }
 const isStep3Open = () => {
     isStep3.value = true
@@ -1587,8 +1588,8 @@ const isShowStep3 = (row) => {
         qrCode(row.code, row)
     }
 }
-//更换支付方式
-const showTable = () => {
+//更换支付方式 切换的时候才清空右侧的提示
+const showTable = (type) => {
     resetForm();
     dialogCheckWait.value = false;
     dialogVisible.value = false;
@@ -1611,11 +1612,15 @@ const showTable = () => {
     params.promoCode = ""
     isChannel.value = true
     imageUrl.value = ""
+    hashCode.value = ""
     requiteVoucherUrl.value = ""
     code.value = ""
     WireTransferAccount.bankMsg = ""
+  if (type){
     introduce.introduce = ""
     introduce.enIntroduce = ""
+  }
+
 }
 const loginComboxOptions = computed(() => {
     return loginOptions.value.map((item) => ({
@@ -1912,11 +1917,11 @@ onUnmounted(() => {
 watch(channelId, async (newVal) => {
 
     if (newVal) {
-        showTable()
+        showTable(true)
         let row = channelListOptions.value.find(item => item.code == newVal)
         console.log(newVal, channelListOptions, 12);
         console.log(row, 12);
-        isShowStep3(row, 1111)
+        isShowStep3(row)
         setTipsAmount()
     }
 });
@@ -1951,9 +1956,9 @@ watch(() => channelData.rate, (newVal) => {
         params.amount1 = (newVal * params.amount).toFixed(2)
     }
 })
-watch(() => imageUrl, (newVal) => {
-    console.log(newVal, 12);
-}, { deep: true })
+// watch(() => imageUrl, (newVal) => {
+//     console.log(newVal, 12);
+// }, { deep: true })
 watch(() => params.agree3, (newVal) => {
     if (newVal) {
         params.agree2 = false

pages/follow/components/applySignalDialog.vue

@@ -148,7 +148,7 @@
         </view>
 
         <!-- 协议 -->
-        <view class="form-item agree">
+        <uni-forms-item class="form-item agree">
           <uni-forms-item name="agree">
             <checkbox-group @change="onAgreeChange">
               <label class="checkbox-agree">
@@ -164,7 +164,7 @@
               </label>
             </checkbox-group>
           </uni-forms-item>
-        </view>
+        </uni-forms-item>
       </view>
     </uni-forms>
 
@@ -652,10 +652,11 @@ watch(() => props.visible, (val) => {
 
     .agree-text {
       font-size: px2rpx(14);
-      color: var(--bs-body-color);
+      color: var(--bs-emphasis-color);
       line-height: 1.5;
       width: 100%;
       white-space: wrap;
+      font-weight: normal;
 
       .a {
         color: #007bff;

pages/follow/index.vue

@@ -13,56 +13,61 @@
       </uni-col>
       <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="uni-col-left">
         <uni-row :gutter="10">
-          <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-            <view class="custom-money">
-              <view class="left">
-                <view class="tit">
+          <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" style="height: 100%">
+            <view class="card tab-card shadow-none">
+              <view>
+                <image class="icon-img" src="/static/images/dollar.png" alt="dollar"/>
+              </view>
+              <view class="table-tit">
+                <view class="tit mb-1">
                   <text>{{ t('Documentary.console.item5') }}</text>
                 </view>
-                <view class="num red">
-                  <text>{{ numberFormat(ChartSetDate.position || '0.00') }}</text>
+                <view class="money">
+                  <h3>${{ numberFormat(ChartSetDate.position || '0.00') }}</h3>
                 </view>
               </view>
             </view>
           </uni-col>
 <!--          <uni-col :xs="24" :sm="12" :md="isDealLogin ? 8 : 12" :lg="isDealLogin ? 4 : 6" :xl="isDealLogin ? 4 : 6">-->
-          <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-            <view class="custom-money">
-              <view class="left">
-                <view class="tit">
+          <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" style="height: 100%">
+            <view class="card tab-card shadow-none bg-danger bg-opacity-10">
+              <view>
+                <image class="icon-img" src="/static/images/money.png" alt="money"/>
+              </view>
+              <view class="table-tit">
+                <view class="tit mb-1 text-danger">
                   <text>{{ t('Documentary.console.item6') }}</text>
                 </view>
-                <view class="num">
-                  <text>{{ numberFormat(ChartSetDate.equity || '0.00') }}</text>
-                </view>
-              </view>
-              <view class="right">
-                <view class="tit">
-                  <text>{{ t('Documentary.console.item9') }}</text>
+                <view class="money d-flex">
+                  <h3>${{ numberFormat(ChartSetDate.equity || '0.00') }}</h3>
                 </view>
-                <view class="num">
-                  <text>{{ numberFormat(ChartSetDate.equityIncrement || '0.00') }}</text>
+                <view>
+                  <view class="tit-1 text-danger">
+                    <text class="yest">{{ t('Documentary.console.item9') }}</text>
+                    <text>${{ numberFormat(ChartSetDate.equityIncrement || '0.00') }}</text>
+                  </view>
                 </view>
               </view>
             </view>
           </uni-col>
 <!--          <uni-col :xs="24" :sm="12" :md="isDealLogin ? 8 : 12" :lg="isDealLogin ? 4 : 6" :xl="isDealLogin ? 4 : 6">-->
-          <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-            <view class="custom-money">
-              <view class="left">
-                <view class="tit">
+          <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" style="height: 100%">
+            <view class="card tab-card shadow-none bg-success bg-opacity-10">
+              <view>
+                <image class="icon-img" src="/static/images/wallet.png" alt="wallet"/>
+              </view>
+              <view class="table-tit">
+                <view class="tit mb-1 text-success">
                   <text>{{ t('Documentary.console.item7') }}</text>
                 </view>
                 <view class="num">
-                  <text>{{ numberFormat(ChartSetDate.balance || '0.00') }}</text>
-                </view>
-              </view>
-              <view class="right">
-                <view class="tit">
-                  <text>{{ t('Documentary.console.item9') }}</text>
+                  <h3>${{ numberFormat(ChartSetDate.balance || '0.00') }}</h3>
                 </view>
-                <view class="num">
-                  <text>{{ numberFormat(ChartSetDate.balanceIncrement || '0.00') }}</text>
+                <view class=" ">
+                  <view class="tit-1 text-success">
+                    <text class="yest">{{ t('Documentary.console.item9') }}</text>
+                    <text >${{ numberFormat(ChartSetDate.balanceIncrement || '0.00') }}</text>
+                  </view>
                 </view>
               </view>
             </view>
@@ -161,10 +166,10 @@
                       <view class="tab h3">{{ t('Documentary.console.item27') }}</view>
                     </view>
                     <view class="num">
-                      <view class="btn crm-cursor" @click="dialogFllowApplyOpen">
+                      <button class="btn btn-danger btn-shadow waves-effect" @click="dialogFllowApplyOpen">
                         +
                         <text>{{ t('Documentary.TundManagement.item12') }}</text>
-                      </view>
+                      </button>
                     </view>
                   </view>
                   <view class="bottom">
@@ -718,7 +723,7 @@ onMounted(async () => {
   background-color: rgb(var(--bs-danger-rgb));
   font-size: px2rpx(16);
   color: #fff;
-  padding: px2rpx(10) px2rpx(20);
+  //padding: px2rpx(10) px2rpx(20);
   border-radius: px2rpx(8);
 }
 
@@ -778,4 +783,33 @@ onMounted(async () => {
   font-size: px2rpx(12);
   line-height: 1.4;
 }
+.tab-card{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  gap: px2rpx(15);
+  padding: px2rpx(20);
+  height: 100%;
+  min-height: px2rpx(115);
+
+  .icon-img{
+    width: px2rpx(50);
+    height: px2rpx(50);
+  }
+  .table-tit{
+    .tit{
+      color: var(--bs-body-color);
+      gap: px2rpx(15);
+    }
+    .tit-1{
+      font-size: px2rpx(12);
+      font-weight: 500;
+    }
+    .yest{
+      margin-right: px2rpx(10);
+    }
+  }
+
+}
 </style>

pages/follow/trading-center.vue

@@ -160,7 +160,7 @@
           </view>
 
           <uni-forms-item name="agree">
-            <label class="agree-label">
+            <label class="agree-label mt-2">
               <checkbox :checked="dialogFllowData.agree" @click="dialogFllowData.agree = !dialogFllowData.agree"
                 style="transform:scale(0.7)" />
               <text>{{ t('Documentary.tradingCenter.item40') }} -</text>
@@ -443,7 +443,7 @@ const dialogFllowData = ref({
   protectType: 1,
   protectAmount: '',
   protectRatio: '',
-  followType: 1,
+  followType: undefined,
   volume: '',
   ratio: '',
   leverage: '',
@@ -695,7 +695,7 @@ const applyFllowCancel = () => {
   .agree-label {
     display: flex;
     align-items: center;
-    font-size: 14px;
+    font-size: px2rpx(14);
     color: var(--bs-heading-color);
 
     .link {

pages/follow/trading-management.vue

@@ -499,22 +499,21 @@
                         </view>
                     </view>
 
-                    <view class="form-item agree">
-                        <uni-forms-item name="agree">
-                            <checkbox-group :value="dialogFllowDataApply.agree ? ['1'] : []" @change="onAgreeChange">
-                                <label class="checkbox-agree">
-                                    <checkbox value="1" :checked="dialogFllowDataApply.agree" />
-                                    <text class="agree-text">
-                                        {{ t('Documentary.TundManagement.item42') }}
-                                        <cwg-link type="pdf" style="text-decoration: underline;" class="a"
-                                            :url="isZh ? 'pdf/CopyTradeUserAgreementcn.pdf' : 'pdf/CopyTradeUserAgreement.pdf'"
-                                            target="_blank" title="Documentary.TundManagement.item43" />
-                                        {{ t('Documentary.TundManagement.item42_2') }}
-                                    </text>
-                                </label>
-                            </checkbox-group>
-                        </uni-forms-item>
-                    </view>
+                  <uni-forms-item class="agree" name="agree">
+                    <checkbox-group :value="dialogFllowDataApply.agree ? ['1'] : []" @change="onAgreeChange">
+                      <label class="checkbox-agree">
+                        <checkbox value="1" :checked="dialogFllowDataApply.agree" />
+                        <text class="agree-text">
+                          {{ t('Documentary.TundManagement.item42') }}
+                          <cwg-link type="pdf" style="text-decoration: underline;" class="a"
+                                    :url="isZh ? 'pdf/CopyTradeUserAgreementcn.pdf' : 'pdf/CopyTradeUserAgreement.pdf'"
+                                    target="_blank" title="Documentary.TundManagement.item43" />
+                          {{ t('Documentary.TundManagement.item42_2') }}
+                        </text>
+                      </label>
+                    </checkbox-group>
+                  </uni-forms-item>
+
                 </view>
             </uni-forms>
 
@@ -1381,11 +1380,16 @@ onMounted(() => {
         display: flex;
         align-items: flex-start;
         gap: px2rpx(8);
+      :deep(.uni-checkbox-input){
+        width: px2rpx(18);
+        height: px2rpx(18);
+      }
 
         .agree-text {
             font-size: px2rpx(14);
-            // color: var(--bs-body-color);
-            line-height: 1.5;
+             color: var(--bs-emphasis-color);
+            line-height: 1.3;
+            font-weight: normal;
             width: 100%;
             white-space: wrap;
 

pages/ib/components/documentaryDialog.vue

@@ -122,4 +122,17 @@
       background-color: var(--color-zinc-100) !important;
     }
   }
+  .agree{
+    .checkbox{
+      :deep(.pdf-link){
+        font-size: px2rpx(14);
+        font-weight: normal;
+      }
+      uni-text{
+        font-size: px2rpx(14);
+        font-weight: normal;
+        line-height: 1;
+      }
+    }
+  }
 </style>

pages/ib/index.vue

@@ -1031,6 +1031,7 @@ onMounted(async () => {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
+  cursor: pointer;
   gap: 10rpx;
 }
 

pages/ib/settingPammManager.vue

@@ -309,17 +309,17 @@ onLoad((options: any) => {
     line-height: px2rpx(32);
     padding: 0 px2rpx(20);
     text-align: center;
-    border: 1px solid #dcdfe6;
+    border-bottom: 1px solid #dcdfe6;
     background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
     font-size: px2rpx(14);
     cursor: pointer;
 
     &:first-child {
-      border-radius: px2rpx(4) 0 0 px2rpx(4);
+      //border-radius: px2rpx(4) 0 0 px2rpx(4);
     }
 
     &:last-child {
-      border-radius: 0 px2rpx(4) px2rpx(4) 0;
+      //border-radius: 0 px2rpx(4) px2rpx(4) 0;
       border-left: none;
     }
 

pages/ib/withdraw.vue

@@ -1180,7 +1180,7 @@ const digitalOptions = computed(() => {
     return ruleForm.bankBlockchain.map((item, index) => ({
         text: `${item.addressName}-${item.address}`,
         value: item.id,
-        // disable: item.authStatus == 0
+        disable: item.authStatus == 0
     }))
 })
 const groupTitleMap = {

pages/login/index.vue

@@ -958,11 +958,13 @@ const handleChatIconClick = () => {
   //position: absolute;
   //top: px2rpx(20);
   //right: px2rpx(20);
+  min-height: px2rpx(46);
   z-index: 10;
   width: 100%;
   display: flex;
   background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   justify-content: flex-end;
+  align-items: center;
 }
 
 .main-content {

pages/mine/info.vue

@@ -1,7 +1,7 @@
 <template>
     <cwg-page-wrapper>
         <view class="info-card">
-          <cwg-header v-if=" current != 4" :title="tabs[current - 1].name" />
+          <cwg-header :title="tabs[current - 1].name" />
 <!--            <view class="content-title" v-if="current != 3 && current != 4">-->
 <!--                <view class="content-title">{{ tabs[current - 1].name }}</view>-->
                 <!--                <view class="content-title-btns">-->

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -340,8 +340,9 @@
 					this.clearPropagation = false
 					return
 				}
+        if (!this.mkclick) return
 				this.$emit('maskClick')
-				if (!this.mkclick) return
+
 				this.close()
 			},
 			/**