From 6e989380408f31133f9790a3a1dc7d16a905d3e6 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Fri, 23 Jul 2021 18:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |   5 +-
 src/components/common/Sidebar.vue             |   2 +-
 src/components/common/dialog/content.vue      |   0
 src/components/common/dialog/insex.vue        |  73 +++++++
 src/components/common/dialog/sidebar.vue      |   0
 .../page/AccountManagement/platformSelect.vue | 181 +++++++++++-------
 src/router/index.js                           |   2 +-
 src/utils/request.js                          |   2 +-
 vue.config.js                                 |  22 +--
 9 files changed, 201 insertions(+), 86 deletions(-)
 create mode 100644 src/components/common/dialog/content.vue
 create mode 100644 src/components/common/dialog/insex.vue
 create mode 100644 src/components/common/dialog/sidebar.vue

diff --git a/src/api/index.js b/src/api/index.js
index 3035ba9..3f92768 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,8 +1,9 @@
 import request from '../utils/request';
 
-export const fetchData = query => {
+
+export const platformAccountList = query => {
     return request({
-        url: './table.json',
+        url: 'public/index.php/api/admin.Task/platform_account_list',
         method: 'get',
         params: query
     });
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 6313454..72c4c38 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -68,7 +68,7 @@ export default {
                     subs:[
                         {
                             index: 'platformSelect',
-                            title: '平台账户查询'
+                            title: '交易平台账户查询'
                         },
                         {
                             index: 'buyerReview',
diff --git a/src/components/common/dialog/content.vue b/src/components/common/dialog/content.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/common/dialog/insex.vue b/src/components/common/dialog/insex.vue
new file mode 100644
index 0000000..5a7a701
--- /dev/null
+++ b/src/components/common/dialog/insex.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <el-dialog :title="dialogData.title" :visible.sync="isshow" width="70%"  :before-close="MisShow">
+      <p class="tips">{{dialogData.tips}}</p>
+      <div class="body">
+        <el-tabs tab-position="left" >
+          <el-tab-pane label="用户管理">用户管理</el-tab-pane>
+          <el-tab-pane label="配置管理">配置管理</el-tab-pane>
+          <el-tab-pane label="角色管理">角色管理</el-tab-pane>
+          <el-tab-pane label="定时任务补偿">定时任务补偿</el-tab-pane>
+        </el-tabs>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="MisShow">取 消</el-button>
+        <el-button type="primary" @click="saveEdit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {whySidebar} from '../dialog/sidebar.vue'
+export default {
+  name:'whyDialog',
+  props:{
+    dialogType:{
+      type:Number,
+      require: true
+    },
+    dialogID:{
+      type:Number,
+      require: true
+    },
+    isshow:{
+      type:Boolean,
+      default:false,
+      require: true
+    }
+  },
+  data(){
+    return {
+      dialogData:{
+        title:'',
+        tips:''
+      }
+    }
+  },
+  components:{
+    whySidebar
+  },
+  created(){
+    if (this.dialogType==1) {
+      this.dialogData.title='账户信息';
+      this.dialogData.tips='以下为交易平台账户申请账户时提交的相关资料：';
+    }
+  },
+  methods:{
+    saveEdit(){
+
+    },
+    MisShow(){
+      this.$emit('MisShow')
+    }
+  }
+}
+</script>
+<style scoped>
+  .tips{
+    font-size: 16px;
+  }
+  .body{
+    display: flex;
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/common/dialog/sidebar.vue b/src/components/common/dialog/sidebar.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/page/AccountManagement/platformSelect.vue b/src/components/page/AccountManagement/platformSelect.vue
index 3fe303c..c88d4fc 100644
--- a/src/components/page/AccountManagement/platformSelect.vue
+++ b/src/components/page/AccountManagement/platformSelect.vue
@@ -5,40 +5,40 @@
                 <el-breadcrumb-item>
                     <i class="el-icon-lx-cascades"></i> 账户管理
                 </el-breadcrumb-item>
-                <el-breadcrumb-item>平台账户查询</el-breadcrumb-item>
+                <el-breadcrumb-item>交易平台账户查询</el-breadcrumb-item>
             </el-breadcrumb>
         </div>
         <div class="container">
             <div class="handle-box">
-              <el-input v-model="query.name" placeholder="机构名称" class="handle-input mr10"></el-input>
-              <el-input  placeholder="账户号码" class="handle-input mr10"></el-input>
-              <el-input  placeholder="申请人名称" class="handle-input mr10"></el-input>
-                <el-select  placeholder="买家开户" class="handle-select mr10">
+                <el-input v-model="query.firm_name" placeholder="机构名称" class="handle-input mr10"></el-input>
+                <el-input v-model="query.phone" placeholder="账户号码" class="handle-input mr10"></el-input>
+                <el-input v-model="query.username" placeholder="申请人名称" class="handle-input mr10"></el-input>
+                <el-select v-model="query.buyer_account_type" placeholder="买家开户" class="handle-select mr10">
                     <el-option key="1" label="广东省" value="广东省"></el-option>
                     <el-option key="2" label="湖南省" value="湖南省"></el-option>
                 </el-select>
-                <el-select v-model="query.address" placeholder="入驻商家" class="handle-select mr10">
+                <el-select v-model="query.enter_shop_type" placeholder="入驻商家" class="handle-select mr10">
                     <el-option key="1" label="广东省" value="广东省"></el-option>
                     <el-option key="2" label="湖南省" value="湖南省"></el-option>
                 </el-select>
-                <el-select v-model="query.address" placeholder="第三方机构" class="handle-select mr10">
+                <el-select v-model="query.third_party_type" placeholder="第三方机构" class="handle-select mr10">
                     <el-option key="1" label="广东省" value="广东省"></el-option>
                     <el-option key="2" label="湖南省" value="湖南省"></el-option>
                 </el-select>
-                <el-select v-model="query.address" placeholder="审核人员" class="handle-select mr10">
+                <el-select v-model="query.auditID" placeholder="审核人员" class="handle-select mr10">
                     <el-option key="1" label="广东省" value="广东省"></el-option>
                     <el-option key="2" label="湖南省" value="湖南省"></el-option>
                 </el-select>
                 <el-date-picker
-                  class="mr10"
-                  v-model="query.time"
-                  type="datetimerange"
-                  :picker-options="pickerOptions"
-                  range-separator="至"
-                  value-format="yyyy-MM-dd h:m:s"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  align="right"
+                    class="mr10"
+                    v-model="query.time"
+                    type="datetimerange"
+                    :picker-options="pickerOptions"
+                    range-separator="至"
+                    value-format="yyyy-MM-dd h:m:s"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    align="right"
                 >
                 </el-date-picker>
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
@@ -52,14 +52,26 @@
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="name" label="申请时间"></el-table-column>
-                <el-table-column label="机构名称" prop="name"></el-table-column>
-                <el-table-column label="账户号码" prop="name"></el-table-column>
-                <el-table-column prop="address" label="申请人名称"></el-table-column>
-                <el-table-column prop="address" label="是否买家开户"></el-table-column>
-                <el-table-column prop="address" label="是否入驻商家"></el-table-column>
-                <el-table-column prop="address" label="是否第三方机构"></el-table-column>
-                <el-table-column prop="date" label="审核人员"></el-table-column>
+                <el-table-column :formatter="formatDate" prop="create_time" label="申请时间"></el-table-column>
+                <el-table-column label="机构名称" prop="firm_name"></el-table-column>
+                <el-table-column label="账户号码" prop="phone"></el-table-column>
+                <el-table-column prop="apply_name" label="申请人名称"></el-table-column>
+                <el-table-column prop="is_buyer" label="是否买家开户">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.is_buyer==1 ? '是':'否'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="is_enter_shop" label="是否入驻商家">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.is_enter_shop==1 ? '是':'否'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="is_third_party" label="是否第三方机构">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.is_third_party==1 ? '是':'否'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="username" label="审核人员"></el-table-column>
                 <el-table-column label="操作" width="280" align="center">
                     <template slot-scope="scope">
                         <el-button
@@ -85,8 +97,8 @@
                 <el-pagination
                     background
                     layout="total, prev, pager, next"
-                    :current-page="query.pageIndex"
-                    :page-size="query.pageSize"
+                    :current-page="query.page"
+                    :page-size="query.limit"
                     :total="pageTotal"
                     @current-change="handlePageChange"
                 ></el-pagination>
@@ -94,7 +106,7 @@
         </div>
 
         <!-- 编辑弹出框 -->
-        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
+        <!-- <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
             <el-form ref="form" :model="form" label-width="70px">
                 <el-form-item label="用户名">
                     <el-input v-model="form.name"></el-input>
@@ -107,22 +119,32 @@
                 <el-button @click="editVisible = false">取 消</el-button>
                 <el-button type="primary" @click="saveEdit">确 定</el-button>
             </span>
-        </el-dialog>
+        </el-dialog> -->
+        <whyDialog v-if="editVisible" :isshow="editVisible" :dialogID="dialogID" :dialogType="dialogType" @MisShow="MisShow"></whyDialog>
     </div>
 </template>
 
 <script>
-import { fetchData } from '../../../api/index';
+import { platformAccountList } from '../../../api/index';
+// import {whyDialog} from '../../common/dialog/insex.vue'
 export default {
-    name: 'basetable',
+    name: 'platformSelect',
     data() {
         return {
             query: {
-                address: '',
-                name: '',
-                pageIndex: 1,
-                pageSize: 10
+                firm_name: '',
+                phone: '',
+                username: '',
+                buyer_account_type: '',
+                enter_shop_type: '',
+                third_party_type: '',
+                auditID: '',
+                time: '',
+                page: 1,
+                limit: 10
             },
+            dialogID:1,
+            dialogType:'',
             tableData: [],
             multipleSelection: [],
             delList: [],
@@ -132,48 +154,52 @@ export default {
             idx: -1,
             id: -1,
             pickerOptions: {
-              shortcuts: [
-                {
-                  text: "最近一周",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近一个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-                {
-                  text: "最近三个月",
-                  onClick(picker) {
-                    const end = new Date();
-                    const start = new Date();
-                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                    picker.$emit("pick", [start, end]);
-                  },
-                },
-              ],
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
             },
         };
     },
+    components:{
+        // whyDialog
+        whyDialog: () => import('../../common/dialog/insex.vue')
+    },
     created() {
         this.getData();
     },
     methods: {
         // 获取 easy-mock 的模拟数据
         getData() {
-            fetchData(this.query).then(res => {
-                // console.log(res);
-                this.tableData = res.list;
-                this.pageTotal = res.pageTotal || 50;
+            platformAccountList(this.query).then(res => {
+                console.log(res);
+                this.tableData = res.data.list;
+                this.pageTotal = res.data.count;
             });
         },
         // 触发搜索按钮
@@ -199,9 +225,9 @@ export default {
         },
         // 编辑操作
         handleEdit(index, row) {
-            this.idx = index;
-            this.form = row;
             this.editVisible = true;
+            this.dialogID=row.id;
+            this.dialogType=1
         },
         // 保存编辑
         saveEdit() {
@@ -213,6 +239,21 @@ export default {
         handlePageChange(val) {
             this.$set(this.query, 'pageIndex', val);
             this.getData();
+        },
+        //时间戳转换时间
+        formatDate(row, column, cellValue, index) {
+            if (cellValue == null || cellValue == "") return "";
+            let date = new Date(parseInt(cellValue*1000));//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+            let Y = date.getFullYear() + '-';
+            let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) + '-' : date.getMonth() + 1 + '-';
+            let D = date.getDate() < 10 ? '0' + date.getDate() + ' ' : date.getDate() + ' ';
+            let h = date.getHours() < 10 ? '0' + date.getHours() + ':' : date.getHours() + ':';
+            let m = date.getMinutes() < 10 ? '0' + date.getMinutes() + ':' : date.getMinutes() + ':';
+            let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+            return Y + M + D + h + m + s;
+        },
+        MisShow(){
+            this.editVisible=false
         }
     }
 };
diff --git a/src/router/index.js b/src/router/index.js
index 5dc298d..d23d5e3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -106,7 +106,7 @@ export default new Router({
                 {
                     path: '/platformSelect',
                     component: () => import(/* webpackChunkName: "platformSelect" */ '../components/page/AccountManagement/platformSelect.vue'),
-                    meta: { title: '平台账户查询' }
+                    meta: { title: '交易平台账户查询' }
                 },
                 {
                     path: '/buyerReview',
diff --git a/src/utils/request.js b/src/utils/request.js
index 0cd1316..6cead04 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 const service = axios.create({
     // process.env.NODE_ENV === 'development' 来判断是否开发环境
     // easy-mock服务挂了，暂时不使用了
-    // baseURL: 'https://www.easy-mock.com/mock/592501a391470c0ac1fab128',
+    baseURL: 'http://wenhua.xingtongworld.com/',
     timeout: 5000
 });
 
diff --git a/vue.config.js b/vue.config.js
index b1fc8fb..9458bfe 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,15 +2,15 @@ module.exports = {
     baseUrl: './',
     assetsDir: 'static',
     productionSourceMap: false,
-    // devServer: {
-    //     proxy: {
-    //         '/api':{
-    //             target:'http://jsonplaceholder.typicode.com',
-    //             changeOrigin:true,
-    //             pathRewrite:{
-    //                 '/api':''
-    //             }
-    //         }
-    //     }
-    // }
+    devServer: {
+        proxy: {
+            '/api':{
+                target:'http://wenhua.xingtongworld.com/',
+                changeOrigin:true,
+                pathRewrite:{
+                    '/api':''
+                }
+            }
+        }
+    }
 }
\ No newline at end of file