退出登录，删除ip

src/api/index.js

@@ -8,9 +8,10 @@ import context from '../main';
 
 axios.interceptors.request.use(
     config => {
-        // config.headers = {
-        //     "Content-Type": "application/json"
-        // }
+        config.headers = {
+            // "Content-Type": "application/json"
+            "Content-Type": "text/html"
+        }
         return config;
     }, error => {
         console.log('error', error);
@@ -30,19 +31,20 @@ axios.interceptors.response.use(
         // loading.close();
         if (res.data.code == 200) {
             return res.data;
-        }else {
+        }
+        else {
             context.$alert(res.data.message,'提示',{
                 confirmButtonText: '确定'
             }).then(()=>{
-                // if(res.data.code == '1005') {
-                //     context.$router.replace({path:'/login'});
-                // }
-                context.$router.replace({path:'/login'});
+                if(res.data.code == '1005') {
+                    context.$router.replace({path:'/login'});
+                }
+                // context.$router.replace({path:'/login'});
             });
         }
     },
     err => {
-        console.log('err', err);
+        console.dir('err', err);
         // loading.close();
         // if (err.message.includes('timeout')) {
         //     err.message = '请求超时';
@@ -114,6 +116,13 @@ export const testRequest = () => {
 export const login = (params) => {
     console.log(`${Prefix}act=merchant_login&op=login`)
     return requestLoading(`${Prefix}act=merchant_login&op=login&client_type=ajax`, 'post', params)
+    // return axios({
+    //     url: `${Prefix}act=merchant_login&op=login&client_type=ajax`,
+    //     method: 'post',
+    //     data: params,
+    //     withCredentials: true,
+    //     timeout: 120000
+    // })
 }
 
 //登出
@@ -126,6 +135,11 @@ export const getIpList = () => {
     return requestLoading(`${Prefix}act=merchant_info&op=ipwhitelist&client_type=ajax`, 'post')
 }
 
+// 删除ip列表
+export const delIpList = (params) => {
+    return requestLoading(`${Prefix}act=merchant_info&op=ipdel&client_type=ajax`, 'post', params)
+}
+
 // 获取订单统计列表
 export const getOrderList = (page) => {
     return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&page=${page}`, 'post')
@@ -141,6 +155,12 @@ export const getOrderList = (page) => {
 export const queryList = (start_time, end_time, card_type) => {
     return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&start_time=${start_time}&end_time=${end_time}&card_type=${card_type}`, 'post')
 }
+
+// 修改管理员密码
+export const editPwd = (params) => {
+    return requestLoading(`${Prefix}act=merchant_info&op=modifypw&client_type=ajax`, 'post', params)
+}
+
 // 余额列表
 // export const balanceList = (params) => {
 //     return requestLoading(`${Prefix}/balanceList`, 'get', params)

src/pages/index.vue

@@ -86,6 +86,7 @@ import {
     editPwd
 } from "@/api";
 export default {
+    name: 'homePage',
     created() {
         this.curPath = this.$route.name;
     },
@@ -147,34 +148,36 @@ export default {
         onLoginOut() {
             loginOut().then((res) => {
                 console.log('登出', res);
-                // if (res && res.msg == "ok") {
-                //     this.$router.replace({
-                //         path: "/login",
-                //     });
-                // }
+                if (res && res.message == "成功") {
+                    this.$router.replace({
+                        path: "/login",
+                    });
+                }
             });
         },
         onEditSubmit(formName) {
-            const _self = this;
-            this.$refs[formName].validate((valid) => {
+            // const _self = this;
+            this.$refs[formName].validate(async (valid) => {
                 if (valid) {
-                    editPwd({
-                        password: _self.editForm.pwd,
-                        repassword: _self.editForm.rePwd,
-                    }).then((res) => {
-                        console.log(res);
-                        if (res && res.msg == "ok") {
-                            this.$message({
-                                message: "修改成功",
-                                type: "success",
-                                center: true,
-                                duration: 1000,
-                                onClose: () => {
-                                    _self.onCloseEditDialog();
-                                },
-                            });
-                        }
-                    });
+                    // editPwd({
+                    //     new_pw: this.editForm.pwd,
+                    //     new_pw2: this.editForm.rePwd,
+                    // }).then((res) => {
+                    //     console.log(res);
+                    //     if (res && res.message == "成功") {
+                    //         this.$message({
+                    //             message: "修改成功",
+                    //             type: "success",
+                    //             center: true,
+                    //             duration: 1000,
+                    //             onClose: () => {
+                    //                 this.onCloseEditDialog();
+                    //             },
+                    //         });
+                    //     }
+                    // });
+                    const res = await editPwd({new_pw: this.editForm.pwd,new_pw2: this.editForm.rePwd,})
+                    console.log('修改密码', res);
                 } else {
                     console.log("error submit!!");
                     return false;

src/pages/subPages/balance.vue

@@ -18,18 +18,20 @@
 
     <el-table :data="tableData" border style="width: 100%;">
         <el-table-column align="center" type="index" width="50" label="序号" />
-        <el-table-column align="center" prop="id" label="订单id"></el-table-column>
-        <el-table-column align="center" prop="type" label="类型"></el-table-column>
+        <!-- <el-table-column align="center" prop="id" label="订单id"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="type" label="类型"></el-table-column> -->
         <el-table-column align="center" prop="money" label="金额/元"></el-table-column>
-        <el-table-column align="center" prop="status" label="状态"></el-table-column>
-        <el-table-column align="center" prop="apply_name" label="申请姓名"></el-table-column>
-        <el-table-column align="center" prop="order_status" label="账号"></el-table-column>
-        <el-table-column align="center" prop="bank_name" label="银行名称"></el-table-column>
-        <el-table-column align="center" prop="recharge_type" label="充值方式"></el-table-column>
-        <el-table-column align="center" prop="payment_type" label="支付方式"></el-table-column>
-        <el-table-column align="center" prop="recharge_code" label="充值凭证"></el-table-column>
-        <el-table-column align="center" prop="apply_time" label="申请时间" width="180"></el-table-column>
-        <el-table-column align="center" prop="examine_time" label="审核时间" width="180"></el-table-column>
+        <!-- <el-table-column align="center" prop="status" label="状态"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="apply_name" label="申请姓名"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="order_status" label="账号"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="bank_name" label="银行名称"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="recharge_type" label="充值方式"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="payment_type" label="支付方式"></el-table-column> -->
+        <el-table-column align="center" prop="recharge_code" label="充值凭证">
+            <el-button type="text">查看</el-button>
+        </el-table-column>
+        <!-- <el-table-column align="center" prop="apply_time" label="申请时间" width="180"></el-table-column> -->
+        <!-- <el-table-column align="center" prop="examine_time" label="审核时间" width="180"></el-table-column> -->
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
@@ -47,8 +49,8 @@ export default {
     data() {
         return {
             tableData: [
-                {id: 1, type: '预充值', money: '', status: '审核中', apply_name: 'admin', order_status: '', bank_name: '', recharge_type: '银行卡', payment_type: '线下支付', recharge_code: '', apply_time: '2020-12-7 10:55', examine_time: '2020-12-07 10:55'},
-                {id: 2, type: '预充值', money: '', status: '审核中', apply_name: 'admin', order_status: '', bank_name: '', recharge_type: '银行卡', payment_type: '线下支付', recharge_code: '', apply_time: '2020-12-7 11:00', examine_time: '2020-12-07 11:00'},
+                {id: 1, money: '100', recharge_code: ''},
+                {id: 2, money: '100', recharge_code: ''},
             ],
             pageSize: 10,
             pageNumber: 1,

src/pages/subPages/order.vue

@@ -86,7 +86,7 @@ export default {
             ],
             pageSize: 10,
             pageNumber: 1,
-            total: 22,
+            total: 0,
             // 筛选时间 start_time end_time
             dataRange: [],
             // 订单总数

src/pages/subPages/view.vue

@@ -14,7 +14,7 @@
         </el-table-column> -->
         <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-                <el-tag type="danger" @click="del(scope.row.ip)">删除</el-tag>
+                <el-tag type="danger" @click="del(scope.$index)">删除</el-tag>
             </template>
         </el-table-column>
     </el-table>
@@ -25,9 +25,10 @@
 </template>
 
 <script>
-// getIpList获取Ip列表
+// getIpList获取Ip列表 delIpList-删除
 import {
-    getIpList
+    getIpList,
+    delIpList
 } from "@/api";
 export default {
     data() {
@@ -39,10 +40,10 @@ export default {
             // boxOptions: [],
             // boxValue: "",
             tableData: [
-                {ip: 123},
-                {ip: 456},
-                {ip: 789},
-                {ip: 123},
+                // {ip: 123},
+                // {ip: 456},
+                // {ip: 789},
+                // {ip: 123},
             ],
             total: 0,
             // ip
@@ -68,15 +69,35 @@ export default {
         async getIpList() {
             const res = await getIpList()
             console.log('获取ip列表', res);
-            // this.tableData = res.datas
+            this.tableData = res.datas
 
         },
         // 删除
-        del(ip) {
-            // 调用删除接口
-            console.log(ip);
-            // 获取列表
-            this.getIpList()
+        del(idx) {
+            console.log('idx', idx);
+            // 提示
+            this.$confirm("确认删除该ip?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+            .then(async () => {
+                // 调用删除接口
+                const res = await delIpList({ip_key: idx})
+                console.log('删除ip', res);
+                if (res.code == 200) {
+                    // 提示
+                    this.$message({
+                        message: '删除成功',
+                        type: 'success'
+                    });
+                    // 获取列表
+                    this.getIpList()
+                }
+            })
+            .catch(() => {
+                return false;
+            });
         },
         // 分页
         // onPageChange(page) {