Merge branch 'admin_dev' into admin_dev_test

# Conflicts:
#	locale/cn.json
#	locale/en.json

components/AddBankDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <cwg-popup :title="title" :visible="visible" @close="onPopupClose" @confirm="submit">
+  <cwg-popup :title="title" :visible="visible" @close="close" @confirm="submit">
 <!--  <uni-popup ref="popupRef" type="center" style="z-index: 999;">-->
 <!--    <view class="dialog-container">-->
 <!--      <view class="dialog-header">-->
@@ -341,13 +341,14 @@ const open = async (type: number) => {
 
 // 关闭弹窗
 const close = () => {
+  resetForm();
   visible.value = false
 
 }
 
 // 弹窗真正关闭后清空表单
 const onPopupClose = () => {
-  resetForm();
+
 };
 
 // 重置表单

locale/cn.json

@@ -33,6 +33,9 @@
       "t3": "总存款",
       "t4": "总取款"
     },
+    "login": {
+      "agreemnet1": " 单击“登录”确认您已阅读、理解并同意本文中的所有信息 "
+    },
     "Btn": {
       "Info": "查看明细"
     },
@@ -743,7 +746,6 @@
     "Upload": "上传文件",
     "More": "更多",
     "Hide": "隐藏"
-
   },
   "State": {
     "ToBeProcessed": "待处理",

locale/en.json

@@ -29,6 +29,9 @@
       "t4": "Total Withdrawal",
       "t5": ""
     },
+    "login": {
+      "agreemnet1": " Click “Log in” to confirm that you have read, understood, and agreed to all the information in this document. "
+    },
     "Btn": {
       "Info": "View Details"
     },
@@ -1549,7 +1552,7 @@
       "Channel4": "Electronic Wallet",
       "Tips": "Tips：Not accept deposits by wire transfer from accounts other than your own",
       "HashCode": "Hash Value",
-      "HashCodePlaceholder": "Please enter the transaction hash",
+      "HashCodePlaceholder": "Please enter the transaction hash"
 
     },
     "Withdraw": {

pages/follow/const/enum.ts

@@ -5,7 +5,7 @@ export const useFollowEnum = () => {
   const { t } = useI18n()
 
 
-  const optList1 = computed(() => [{ text: t('vu.follow.enum1'), value: '7' }, { text: t('vu.follow.enum2'), value: '15' }, { text: t('vu.follow.enum3'), value: '30' }])
+  const optList1 = computed(() => [{ text: t('vu.follow.enum1'), value: 7 }, { text: t('vu.follow.enum2'), value: 15 }, { text: t('vu.follow.enum3'), value: 30 }])
   const optObj = computed(() => ({
     7:t('vu.follow.enum1'),
     15:t('vu.follow.enum2'),

pages/login/index.vue

@@ -111,6 +111,18 @@
                 {{ t('signin.words') }}
                 <text>{{ t('signin.signup') }}</text>
               </view>
+              <view class="des-bottom">
+                <text v-t="'vu.login.agreemnet1'"></text>
+                <cwg-link type="pdf" url='pdf/Client_Agreement.pdf' target="_blank" :title="'signup.agreemnet2'"
+                          class="desc-link" />
+                <text v-t="'signup.agreemnet3'"></text>
+                <cwg-link type="pdf" url='pdf/Terms&Conditions.pdf' target="_blank" :title="'signup.agreemnet4'"
+                          class="desc-link" />
+                <text v-t="'signup.agreemnet5'"></text>
+                <cwg-link type="pdf" url='pdf/Privacy_Policy.pdf' target="_blank" :title="'signup.agreemnet6'"
+                          class="desc-link" />
+                <text v-t="'signup.agreemnet7'"></text>
+              </view>
             </view>
             <view v-show="activeTab == 2" style="overflow-y: scroll;">
               <view class="title">

pages/mine/components/AddFileDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <cwg-popup :title="form.title" :visible="visible" @close="onPopupClose" @confirm="submit" >
+  <cwg-popup :title="form.title" :visible="visible" @close="close" @confirm="submit" >
 <!--        <view class="dialog-container">-->
 <!--            <view class="dialog-header">-->
 <!--                <text class="dialog-title">{{ form.title }}</text>-->
@@ -117,6 +117,7 @@ const open = async (item) => {
 
 // 关闭弹窗
 const close = () => {
+    resetForm();
     visible.value = false
 };