Merge branch 'main' of https://git.nuttyreading.com/zm/nuttyreading_global_master

src/utils/httpRequest.js

@@ -6,7 +6,7 @@ import merge from 'lodash/merge'
 import { clearLoginInfo } from '@/utils'
 
 const http = axios.create({
-  timeout: 1000 * 30,
+  timeout: 1000 * 180,
   withCredentials: true,
   headers: {
     'Content-Type': 'application/json; charset=utf-8'

src/views/modules/migration/migrationList.vue

@@ -1,37 +1,58 @@
 <template>
     <div>
         <el-form :inline="true">
-            <el-form-item label="登录账号">
+            <el-form-item label="转移账号">
-                <el-input v-model="migrationObj.bookName" placeholder="手机号/邮箱" clearable></el-input>
+                <el-input v-model="email" placeholder="邮箱" clearable></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary">查询</el-button>
+                <el-button type="primary" @click="queryButton">查询</el-button>
             </el-form-item>
         </el-form>
-        <el-table :data="tableData" border style="width: 100%">
+        <el-table :data="tableData" border style="width: 100%" v-loading="dataListLoading">
-            <el-table-column prop="date" label="日期">
+            <el-table-column prop="user.email" align="center" label="迁移账号邮箱">
             </el-table-column>
-            <el-table-column prop="name" label="姓名">
+            <el-table-column prop="wumenUser.email" align="center" label="吴门医述·邮箱">
+                <template slot-scope="scope">
+                    {{ scope.row.wumenUser.email || '-' }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="wumenUser.tel" align="center" label="吴门医述·手机号">
+                <template slot-scope="scope">
+                    {{ scope.row.wumenUser.tel || '-' }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="type" align="center" label="转移数据">
+            </el-table-column>
+            <el-table-column prop="createTime" align="center" label="操作时间">
             </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
-                    <el-button @click="handleClick()" type="text" size="small">详情</el-button>
+                    <el-button @click="handleClick(scope.row.user.id)" type="text" size="small">详情</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
-            :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="tableData.length"
+            :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
             layout="total, sizes, prev, pager, next, jumper">
         </el-pagination>
         <el-dialog title="详细信息" :visible.sync="migrationState">
-            <el-descriptions border>
+            <el-table :data="detailedData" border style="width: 100%">
-                <el-descriptions-item label="用户名">kooriookami</el-descriptions-item>
+                <el-table-column prop="type" align="center" label="转移功能">
-                <el-descriptions-item label="手机号">18100000000</el-descriptions-item>
+                </el-table-column>
-                <el-descriptions-item label="居住地">苏州市</el-descriptions-item>
+                <el-table-column prop="content" align="center" label="内容">
-                <el-descriptions-item label="联系地址">江苏省苏州市吴中区吴中大道 1188 号</el-descriptions-item>
+                    <template slot-scope="scope">
-            </el-descriptions>
+                        {{ scope.row.content || '-' }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createTime" align="center" label="操作时间">
+                </el-table-column>
+                <el-table-column prop="remark" align="center" label="备注">
+                    <template slot-scope="scope">
+                        {{ scope.row.remark || '-' }}
+                    </template>
+                </el-table-column>
+            </el-table>
             <span slot="footer" class="dialog-footer">
-                
                 <el-button type="primary" @click="migrationState = false">取消</el-button>
             </span>
         </el-dialog>
@@ -42,23 +63,70 @@
 export default {
     data() {
         return {
-            tableData: [{
+            tableData: [],
-                date: '2016-05-02',
-                name: '王小虎'
-            }],
             migrationObj: {
                 bookName: ''
             },
             pageSize: 10,
             pageIndex: 1,
-            migrationState: false
+            migrationState: false,
+            dataListLoading: false,
+            email: '',
+            totalPage: 0,
+            detailedData: []
         }
     },
+    created() {
+        this.getDataList();
+    },
     methods: {
-        handleClick() {
+        handleClick(id) {
+            console.log(id, 'id');
             this.migrationState = true
+            this.$http
+                .request({
+                    url: this.$http.adornUrl(`/bookAbroad/userMigration/userMigrationInfo`),
+                    method: "POST",
+                    data: {
+                        userId: id
+                    },
+                    header: {
+                        //默认 无 说明：请求头
+                        "Content-Type": "application/json"
+                    }
+                })
+                .then(({ data }) => {
+                    console.log(data, 'data');
+                    this.detailedData = data.list
+                });
+        },
+        getDataList() {
+            this.dataListLoading = true;
+            this.$http
+                .request({
+                    url: this.$http.adornUrl(`/bookAbroad/userMigration/userMigrationList`),
+                    method: "POST",
+                    data: {
+                        page: this.pageIndex,
+                        limit: this.pageSize,
+                        email: this.email,
+                    },
+                    header: {
+                        //默认 无 说明：请求头
+                        "Content-Type": "application/json"
+                    }
+                })
+                .then(({ data }) => {
+                    const { records, total, current } = data.page
+                    this.tableData = records,
+                    this.totalPage = total;
+                    this.pageIndex = current;
+                    this.dataListLoading = false
+                });
+        },
+        queryButton() {
+            this.getDataList()
         },
-
         // 每页数
         sizeChangeHandle(val) {
             this.pageSize = val;

src/views/modules/recharge/rechargeList.vue

@@ -208,8 +208,8 @@ export default {
     },
     selectMethod() {
       console.log(this.radio);
+      this.dataList = []
       this.getDataList()
-      
     },
     // 获取数据列表
     getDataList() {
@@ -224,7 +224,7 @@ export default {
             page: this.pageIndex,
             limit: this.pageSize,
             type: "point",
-            //qudao: "Google"
+
             qudao: this.radio
           },
           header: {