feat: #对接提款审核接口

README.md

@@ -6,7 +6,6 @@ English | [简体中文](./README-zh.md)
 
 **Live demo:** http://panjiachen.github.io/vue-admin-template
 
-
 **The current version is `v4.0+` build on `vue-cli`. If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0), it does not rely on `vue-cli`**
 
 ## Build Setup
@@ -80,11 +79,15 @@ For `typescript` version, you can use [vue-typescript-admin-template](https://gi
 Modern browsers and Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| IE10, IE11, Edge                                                                                                                                                                                                | last 2 versions                                                                                                                                                                                                   | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                               |
 
 ## License
 
 [MIT](https://github.com/PanJiaChen/vue-admin-template/blob/master/LICENSE) license.
 
 Copyright (c) 2017-present PanJiaChen
+
+1. 后台前端需要重置标准表格宽度
+2. 后台前端富文本需要 px 转换 rem
+3. 后台后端列表需要 sort 排序

src/api/statistics/withdrawalRecord.js

@@ -1,8 +1,8 @@
 import api from '@/utils/request';
 
 export const getList = params =>
-	api.post(`/yxl-back-end/admin/tweet/page`, params);
+	api.post(`/yxl-back-end/admin/withdrawal/record/page`, params);
 export const getItem = ({ id, ...params }) =>
-	api.get(`/yxl-back-end/admin/tweet/${id}`, params);
-export const auditItem = params =>
-	api.post(`/yxl-back-end/admin/tweet/save`, params);
+	api.get(`/yxl-back-end/admin/withdrawal/record/${id}`, params);
+export const auditItem = ({ id, ...params }) =>
+	api.put(`/yxl-back-end/admin/withdrawal/record/${id}/audit`, params);

src/containers/ToolbarContainer.vue

@@ -68,6 +68,7 @@
               type="datetimerange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
 

src/permission.js

@@ -21,6 +21,7 @@ router.beforeEach(async (to, from, next) => {
   const hasToken = getToken();
 
   if (hasToken) {
+    console.log(to);
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
       next({ path: '/' });

src/router/index.js

@@ -61,47 +61,47 @@ export const constantRoutes = [
   },
 
   {
-      path: 'statistics',
-      component: Layout,
-      redirect: '/statistics/DownloadImage',
-      name: '数据统计',
-      meta: {
-        title: '数据统计',
-        icon: 'el-icon-s-help'
+    path: '/statistics',
+    component: Layout,
+    redirect: '/statistics/DownloadImage',
+    name: '数据统计',
+    meta: {
+      title: '数据统计',
+      icon: 'el-icon-s-help'
+    },
+    children: [
+      {
+        path: 'DownloadImage',
+        name: '下载照片',
+        component: () => import('@/views/statistics/downloadImage/index'),
+        meta: {
+          title: '下载照片'
+          // icon: 'table'
+        }
       },
-      children: [
-        {
-          path: 'DownloadImage',
-          name: '下载照片',
-          component: () => import('@/views/statistics/downloadImage/index'),
-          meta: {
-            title: '下载照片'
-            // icon: 'table'
-          }
-        },
-        {
-          path: 'UploadImage',
-          name: '上传照片',
-          component: () => import('@/views/statistics/uploadImage/index'),
-          meta: {
-            title: '上传照片'
-            // icon: 'tree'
-          }
-        },
-        {
-          path: 'WithdrawalRecord',
-          name: '提现记录',
-          component: () => import('@/views/statistics/withdrawalRecord/index'),
-          meta: {
-            title: '提现记录'
-            // icon: 'tree'
-          }
+      {
+        path: 'UploadImage',
+        name: '上传照片',
+        component: () => import('@/views/statistics/uploadImage/index'),
+        meta: {
+          title: '上传照片'
+          // icon: 'tree'
         }
-      ]
-    },
+      },
+      {
+        path: 'WithdrawalRecord',
+        name: '提现记录',
+        component: () => import('@/views/statistics/withdrawalRecord/index'),
+        meta: {
+          title: '提现记录'
+          // icon: 'tree'
+        }
+      }
+    ]
+  },
 
   {
-    path: 'financialManagement',
+    path: '/financialManagement',
     component: Layout,
     redirect: '/financialManagement/OrderManagement',
     name: '财务管理',
@@ -114,7 +114,7 @@ export const constantRoutes = [
         path: 'OrderManagement',
         name: '订单列表',
         component: () =>
-        import('@/views/financialManagement/orderManagement/index'),
+          import('@/views/financialManagement/orderManagement/index'),
         meta: {
           title: '订单列表'
           // icon: 'table'
@@ -155,7 +155,7 @@ export const constantRoutes = [
         path: 'BannerManagement',
         name: 'Banner管理',
         component: () =>
-        import('@/views/baseManagement/bannerManagement/index'),
+          import('@/views/baseManagement/bannerManagement/index'),
         meta: {
           title: 'Banner管理'
           // icon: 'table'
@@ -174,7 +174,7 @@ export const constantRoutes = [
         path: 'ProblemFeedbackManagement',
         name: '问题反馈管理',
         component: () =>
-        import('@/views/baseManagement/problemFeedbackManagement/index'),
+          import('@/views/baseManagement/problemFeedbackManagement/index'),
         meta: {
           title: '问题反馈管理'
           // icon: 'tree'
@@ -197,7 +197,7 @@ export const constantRoutes = [
         path: 'ImageGoodsManagement',
         name: '照片商品管理',
         component: () =>
-        import('@/views/photoManagement/imageGoodsManagement/index'),
+          import('@/views/photoManagement/imageGoodsManagement/index'),
         meta: {
           title: '照片商品管理'
           // icon: 'table'
@@ -216,7 +216,7 @@ export const constantRoutes = [
         path: 'UploadManagement',
         name: '上传照片管理',
         component: () =>
-        import('@/views/photoManagement/uploadManagement/index'),
+          import('@/views/photoManagement/uploadManagement/index'),
         meta: {
           title: '上传照片管理'
           // icon: 'tree'
@@ -239,7 +239,7 @@ export const constantRoutes = [
         path: 'PhotographerVerify',
         name: '摄影师审核',
         component: () =>
-        import('@/views/photographerManagement/photographerVerify/index'),
+          import('@/views/photographerManagement/photographerVerify/index'),
         meta: {
           title: '摄影师审核'
           // icon: 'table'
@@ -249,7 +249,7 @@ export const constantRoutes = [
         path: 'PhotoVerify',
         name: '照片管理',
         component: () =>
-        import('@/views/photographerManagement/photoVerify/index'),
+          import('@/views/photographerManagement/photoVerify/index'),
         meta: {
           title: '照片管理'
           // icon: 'tree'
@@ -396,7 +396,7 @@ export const constantRoutes = [
         path: 'AccountManagement',
         name: '账号列表',
         component: () =>
-        import('@/views/systemManagement/accountManagement/index'),
+          import('@/views/systemManagement/accountManagement/index'),
         meta: {
           title: '账号列表'
           // icon: 'table'
@@ -406,7 +406,7 @@ export const constantRoutes = [
         path: 'RoleManagement',
         name: '角色列表',
         component: () =>
-        import('@/views/systemManagement/roleManagement/index'),
+          import('@/views/systemManagement/roleManagement/index'),
         meta: {
           title: '角色列表'
           // icon: 'tree'

src/views/statistics/withdrawalRecord/index.vue

@@ -47,6 +47,11 @@ export default {
           width: '120'
         },
         {
+          key: 'channels',
+          name: '提现渠道',
+          width: '120'
+        },
+        {
           key: 'value',
           name: '提现金额',
           minWidth: '80',
@@ -117,6 +122,13 @@ export default {
         }
       ]
     };
+  },
+  created() {
+    this.$g_on('withdrawal_record_reload', this.reload);
+  },
+
+  beforeDestroy() {
+    this.$g_off('withdrawal_record_reload', this.reload);
   }
 };
 </script>

src/views/statistics/withdrawalRecord/modal/ItemModal.vue

@@ -10,7 +10,7 @@
       }
     "
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-form-item label="提现用户"> {{ form.accountName }} </el-form-item>
       <el-form-item label="提现手机号"> {{ form.phonenumber }} </el-form-item>
       <el-form-item label="提现金额"> ￥{{ form.value }} </el-form-item>
@@ -34,6 +34,15 @@
         </el-input>
         <span v-else>{{ form.auditMsg }}</span>
       </el-form-item>
+      <el-form-item v-if="form.auditStatus === 1" label="第三方支付标识">
+        <el-input
+          v-if="auditStatus !== 1"
+          v-model="form.transactionId"
+          placeholder="请输入第三方支付标识"
+        >
+        </el-input>
+        <span v-else>{{ form.transactionId }}</span>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="modal = false">取消</el-button>
@@ -116,14 +125,15 @@ export default {
         if (valid) {
           const params = {
             auditStatus: this.form.auditStatus,
-            auditMsg: this.form.auditMsg
+            auditMsg: this.form.auditMsg,
+            transactionId: this.form.transactionId
           };
           if (this.id) params.id = this.id;
           const { success, msg } = await auditItem(params);
           if (success) {
             this.$success('保存成功！');
             this.modal = false;
-            this.$g_emit('scene_reload');
+            this.$g_emit('withdrawal_record_reload');
           }
         }
       });