Merge branch 'dev' into 'master'

Dev

See merge request !61

src/common/api/user/user.js

@@ -6,3 +6,75 @@ export function getUserRechargeRecordListApi(params) {
 export function getSubjectListApi(params) {
 export function getSubjectListApi(params) {
   return axios.get('/pay/businessPayRecord/subjectList', params)
   return axios.get('/pay/businessPayRecord/subjectList', params)
 }
 }
+
+// 收款账户管理 获取账户类型
+export function getAccountTypeListApi() {
+  return axios.get('/baseProceedsAccount/accountTypeList')
+}
+
+// 收款账户管理 获取收款方式
+export function getReceiverTypeListApi() {
+  return axios.get('/baseProceedsAccount/receiverTypeList')
+}
+
+// 收款账户管理 获取收款方式
+export function getBusinessTypeListApi() {
+  return axios.get('/baseProceedsAccount/businessTypeList')
+}
+
+// 收款账户管理 获取币种
+export function getCurrencyTypeListApi() {
+  return axios.get('/manage/rest/baseCurrencyInfo/uniList')
+}
+
+// 收款账户管理 获取安全设置
+export function getSecuritySettingApi() {
+  return axios.get('/sysSecuritySettings/getOne')
+}
+
+// 收款账户管理 获取收款账户列表
+export function getBaseProceedsAccountListApi(params) {
+  return axios.post('/baseProceedsAccount/list_page', params)
+}
+
+// 获取收款账户详情
+export function getBaseProceedsAccountDetailApi(id) {
+  return axios.get(`/baseProceedsAccount/get?id=${id}`)
+}
+
+// 获取收款账户操作日志
+export function getBaseProceedsAccountLogApi(id) {
+  return axios.get(`/baseProceedsAccountLog/getList?relaId=${id}`)
+}
+
+// 收款账户管理 更新收款账户启用状态
+export function updateBaseProceedsAccountEnableApi(params) {
+  return axios.post('/baseProceedsAccount/updateEnable', params)
+}
+
+// 收款账户管理 新增收款账户
+export function addBaseProceedsAccountApi(params) {
+  return axios.post('/baseProceedsAccount/add', params)
+}
+
+// 收款账户管理 更新收款账户
+export function updateBaseProceedsAccountApi(params) {
+  return axios.post('/baseProceedsAccount/update', params)
+}
+
+// 收款账户管理 删除收款账户
+export function deleteBaseProceedsAccountApi(params) {
+  return axios.post('/baseProceedsAccount/delete', params)
+}
+
+// 收款账户管理 发送手机验证码
+export function sendPhoneCodeApi(params) {
+  return axios.post('/sysSecuritySettings/sendPhoneCode', params)
+}
+
+// 收款账户管理 发送邮箱验证码
+export function sendEmailCodeApi(email, operateType) {
+  return axios.get(
+    `/sysSecuritySettings/sendEmailCode?email=${email}&operateType=${operateType}`
+  )
+}

src/common/components/element-ui.js

@@ -38,7 +38,10 @@ import {
   CheckboxGroup,
   CheckboxGroup,
   Divider,
   Divider,
   Popover,
   Popover,
-  Upload
+  Upload,
+  Descriptions,
+  DescriptionsItem,
+  InputNumber
 } from 'element-ui'
 } from 'element-ui'
 
 
 const components = [
 const components = [
@@ -76,7 +79,10 @@ const components = [
   ColorPicker,
   ColorPicker,
   CheckboxGroup,
   CheckboxGroup,
   Popover,
   Popover,
-  Upload
+  Upload,
+  Descriptions,
+  DescriptionsItem,
+  InputNumber
 ]
 ]
 
 
 export default {
 export default {
@@ -88,13 +94,13 @@ export default {
     Vue.prototype.$message = (message) =>
     Vue.prototype.$message = (message) =>
       typeof message === 'string'
       typeof message === 'string'
         ? Message({
         ? Message({
-          duration: 2500,
-          message,
-        })
+            duration: 2500,
+            message
+          })
         : Message({
         : Message({
-          duration: 2500,
-          ...message,
-        })
+            duration: 2500,
+            ...message
+          })
     Vue.prototype.$message.success = (message) =>
     Vue.prototype.$message.success = (message) =>
       typeof message === 'string'
       typeof message === 'string'
         ? Message.success({ duration: 2500, message })
         ? Message.success({ duration: 2500, message })
@@ -115,5 +121,5 @@ export default {
     Vue.prototype.$alert = MessageBox.alert
     Vue.prototype.$alert = MessageBox.alert
     Vue.prototype.$confirm = MessageBox.confirm
     Vue.prototype.$confirm = MessageBox.confirm
     Vue.prototype.$prompt = MessageBox.prompt
     Vue.prototype.$prompt = MessageBox.prompt
-  },
+  }
 }
 }

src/router/index.js

@@ -116,6 +116,12 @@ const routes = [
         meta: { title: '充值记录' }
         meta: { title: '充值记录' }
       },
       },
       {
       {
+        path: '/saas/user/base_proceeds_account',
+        component: () => import('@/views/user/baseProceedsAccount.vue'),
+        name: 'base_proceeds_account',
+        meta: { title: '收款账户管理' }
+      },
+      {
         path: '/saas/logistics/transporters',
         path: '/saas/logistics/transporters',
         component: () => import('@/views/system/transporters.vue'),
         component: () => import('@/views/system/transporters.vue'),
         name: 'system_transporters',
         name: 'system_transporters',

src/views/home/navMenu.vue

@@ -377,6 +377,14 @@ export default {
               children: []
               children: []
             },
             },
             {
             {
+              id: 3,
+              path: '',
+              label: '收款账户管理',
+              icon: 'el-icon-s-finance',
+              index: '/saas/user/base_proceeds_account',
+              children: []
+            },
+            {
               id: 2,
               id: 2,
               path: '',
               path: '',
               label: '充值记录',
               label: '充值记录',

src/views/system/sysSecuritySettings.vue

@@ -183,7 +183,10 @@
           type="warning"
           type="warning"
           size="small"
           size="small"
           v-if="currentMethod !== 'phone' && securityData.phone"
           v-if="currentMethod !== 'phone' && securityData.phone"
-          @click="currentMethod = 'phone'"
+          @click="
+            currentMethod = 'phone'
+            resetForm()
+          "
           style="width: 100%">
           style="width: 100%">
           手机验证
           手机验证
         </el-button>
         </el-button>
@@ -192,7 +195,10 @@
           type="success"
           type="success"
           size="small"
           size="small"
           v-if="currentMethod !== 'mailbox' && securityData.mailbox"
           v-if="currentMethod !== 'mailbox' && securityData.mailbox"
-          @click="currentMethod = 'mailbox'"
+          @click="
+            currentMethod = 'mailbox'
+            resetForm()
+          "
           style="width: 100%">
           style="width: 100%">
           邮箱验证
           邮箱验证
         </el-button>
         </el-button>
@@ -205,7 +211,10 @@
             dialogType !== 'addPassword' &&
             dialogType !== 'addPassword' &&
             securityData.superPassword
             securityData.superPassword
           "
           "
-          @click="currentMethod = 'superPassword'"
+          @click="
+            currentMethod = 'superPassword'
+            resetForm()
+          "
           style="width: 100%">
           style="width: 100%">
           超级密码验证
           超级密码验证
         </el-button>
         </el-button>
@@ -486,7 +495,8 @@ export default {
           const res = await axios.post(url, {
           const res = await axios.post(url, {
             ...filteredForm,
             ...filteredForm,
             checkType: this.currentMethod,
             checkType: this.currentMethod,
-            unbindType: this.currentTarget
+            unbindType: this.currentTarget,
+            operateType: this.dialogTitle
           })
           })
           if (res.code !== 200) throw new Error('操作失败')
           if (res.code !== 200) throw new Error('操作失败')
           this.$message.success(message)
           this.$message.success(message)
@@ -503,8 +513,8 @@ export default {
     resetForm() {
     resetForm() {
       this.$refs.dialogForm?.resetFields()
       this.$refs.dialogForm?.resetFields()
       this.dialogForm = {
       this.dialogForm = {
-        phone: '',
-        mailbox: '',
+        phone: this.securityData.phone || '',
+        mailbox: this.securityData.mailbox || '',
         code: '',
         code: '',
         superPassword: '',
         superPassword: '',
         newSuperPassword1: '',
         newSuperPassword1: '',