优化数据展示，预提测版本 -zzx

config/dev.env.js

@@ -6,4 +6,5 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://192.168.110.241:9120/zs/channel/admin"'
   BASE_API: '"http://192.168.2.21:9120/zs/channel/admin"'
+  // BASE_API: '"https://channel.admin.dev.zonelife.cn"'
 })

config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"https://channel.admin.dev.zonelife.cn"'
+  BASE_API: '"https://admin-api.macrozheng.com"'
 }

src/styles/index.scss

@@ -9,6 +9,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  background-color: #fafafa;
 }
 
 html {

src/views/channel/info/index.vue

@@ -3,7 +3,7 @@
  * @version: 1.0
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
- * @LastEditors: zzx
+ * @LastEditors: zzx tigerzouzx@foxmail.com
  * @LastEditTime: 2024-11-19 16:08:16
 -->
 <template>

src/views/distribution/changePwd/index.vue

@@ -84,14 +84,18 @@ export default {
                 this.$message.error('两次输入的密码不一致')
                 return
             }
-            updatePassword({ ...data }).then(res => {
-                if (res.code == 200) {
-                    this.$message.success('修改成功，请重新登录')
-                    this.$store.dispatch('LogOut').then(() => {
-                        location.reload() // 为了重新实例化vue-router对象 避免bug
+            this.$refs.admin.validate(valid => {
+                if (valid) {
+                    updatePassword({ ...data }).then(res => {
+                        if (res.code == 200) {
+                            this.$message.success('修改成功，请重新登录')
+                            this.$store.dispatch('LogOut').then(() => {
+                                location.reload() 
+                            })
+                            removeToken()
+                            window.localStorage.clear()
+                        }
                     })
-                    removeToken()
-                    window.localStorage.clear()
                 }
             })
         }

src/views/distribution/distributionSet/index.vue

@@ -3,13 +3,13 @@
  * @version: 1.0
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
- * @LastEditors: zzx
- * @LastEditTime: 2024-11-19 16:08:16
+ * @LastEditors: zzx tigerzouzx@foxmail.com
+ * @LastEditTime: 2024-11-20 16:32:51
 -->
 <template>
     <div class="app-container">
         <el-card class="filter-container" shadow="hover">
-            <el-form :model="admin" ref="admin" label-width="150px" :rules="rules" size="mini">
+            <el-form :model="admin" ref="admin" label-width="150px" :rules="rules" size="small">
                 <div class="blSet">
                     <h4>返佣比例设置</h4>
                     <span @click="forbiddenDialogVisible = true">查看说明</span>
@@ -32,7 +32,7 @@
             </el-form>
             <el-divider content-position="left"></el-divider>
             <div style="display: flex;align-items: center;justify-content: center;">
-                <el-button type="primary" @click="submitForm" size="medium">保存</el-button>
+                <el-button type="primary" @click="submitForm" :loading="setLoading" size="medium">保存</el-button>
             </div>
         </el-card>
         <el-dialog title="查看说明" :visible.sync="forbiddenDialogVisible" width="50%">
@@ -49,11 +49,11 @@
             <div style="margin-top: 20px;">
                 <el-table ref="adminTable" :data="list" border>
                     <el-table-column label="时间段" align="center" prop="times"></el-table-column>
-                    <el-table-column label="电费(元/度)"  align="center" prop="electricity"></el-table-column>
-                    <el-table-column label="结算服务费(元)"  align="center" prop="service"></el-table-column>
+                    <el-table-column label="电费(元/度)" align="center" prop="electricity"></el-table-column>
+                    <el-table-column label="结算服务费(元)" align="center" prop="service"></el-table-column>
                     <el-table-column label="结算费合计(元/度)" align="center" prop="total"></el-table-column>
                     <el-table-column label="运营服务费(元)" align="center" prop="operate"></el-table-column>
-                    <el-table-column label="销售合计价格(元/度)"  align="center" prop="sellTotal"></el-table-column>
+                    <el-table-column label="销售合计价格(元/度)" align="center" prop="sellTotal"></el-table-column>
                 </el-table>
             </div>
         </el-dialog>
@@ -72,6 +72,7 @@ export default {
         return {
             admin: Object.assign({}, defaultAdmin),
             forbiddenDialogVisible: false,
+            setLoading: false,
             list: [{
                 times: '09:00-12:00',
                 electricity: '0.82',
@@ -101,32 +102,33 @@ export default {
     },
     methods: {
         submitForm() {
-            this.$confirm("是否确认提交?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                let updateData = {
-                    id: this.admin.id,
-                    firstLevel: this.admin.firstLevel,
-                    secondLevel: this.admin.secondLevel,
-                    maxUserCount: this.admin.maxUserCount,
-                };
-                distributionSet({ ...updateData }).then((response) => {
-                    if (response.code == 200) {
-                        this.$message({
-                            message: "提交成功！",
-                            type: "success",
+            this.$refs.admin.validate(valid => {
+                if (valid) {
+                    this.$confirm("是否确认提交?", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                    }).then(() => {
+                        let updateData = {
+                            id: this.admin.id,
+                            firstLevel: this.admin.firstLevel,
+                            secondLevel: this.admin.secondLevel,
+                            maxUserCount: this.admin.maxUserCount,
+                        };
+                        this.setLoading= true
+                        distributionSet({ ...updateData }).then((response) => {
+                            this.setLoading= false
+                            if (response.code == 200) {
+                                this.$message({
+                                    message: "提交成功！",
+                                    type: "success",
+                                });
+                                this.get_systemconfig()
+                            }
                         });
-                        this.get_systemconfig()
-                    } else {
-                        this.$message({
-                            message: response.msg,
-                            type: "error",
-                        });
-                    }
-                });
-            });
+                    });
+                }
+            })
         },
 
         // 获取系统配置

src/views/distribution/peopleManage/index.vue

@@ -3,7 +3,7 @@
  * @version: 1.0
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
- * @LastEditors: zzx
+ * @LastEditors: zzx tigerzouzx@foxmail.com
  * @LastEditTime: 2024-11-19 16:08:16
 -->
 <template>

src/views/distribution/statistics/index.vue

@@ -64,7 +64,7 @@
                 </el-table-column>
                 <el-table-column label="操作" width="180" align="center">
                     <template slot-scope="scope">
-                        <el-button size="mini" :disabled="isAdmin==0" type="warning" plain @click="withdrawApplyfor(scope.row)">
+                        <el-button v-if="isAdmin!=0" size="mini" type="warning" plain @click="withdrawApplyfor(scope.row)">
                             提现申请
                         </el-button>
                     </template>

src/views/distribution/userList/index.vue

@@ -3,8 +3,8 @@
  * @version: 1.0
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
- * @LastEditors: zzx
- * @LastEditTime: 2024-11-19 16:08:16
+ * @LastEditors: zzx tigerzouzx@foxmail.com
+ * @LastEditTime: 2024-11-20 18:00
 -->
 <template>
     <div class="app-container">
@@ -41,7 +41,7 @@
         <el-card class="operate-container" shadow="hover">
             <i class="el-icon-tickets"></i>
             <span>数据列表</span>
-            <span style="font-size: 14px;color: red;margin-left: 20px;">注：设置为分销员后后台账号为手机号，默认密码为123456</span>
+            <span class="tips">注：设置分销权限后后台账号为手机号，默认密码为123456</span>
         </el-card>
         <div class="table-container">
             <el-table ref="adminTable" :data="list" style="width: 100%" v-loading="listLoading" border>
@@ -64,13 +64,13 @@
                         <span v-if="isAdmin == 0">
                             <el-button v-if="scope.row.type==1" size="mini" type="success" plain
                                 @click="get_settingType(scope.$index, scope.row)">
-                                设为一级分销员
+                                设为一级分销
                             </el-button>
                         </span>
                         <span v-else>
-                            <el-button v-if="isAdmin==2" size="mini" type="warning" plain
+                            <el-button v-if="isAdmin==2 && scope.row.type!=3" size="mini" type="warning" plain
                                 @click="get_settingType(scope.$index, scope.row)">
-                                设为二级分销员
+                                设为二级分销
                             </el-button>
                         </span>
                         <el-button size="mini" v-if="scope.row.type != 1 && scope.row.type != null" type="primary" plain
@@ -90,8 +90,16 @@
         <el-dialog title="查看绑定用户" :visible.sync="forbiddenDialogVisible" width="60%" :before-close="handleClose">
             <el-table ref="adminTable" :data="dialogList" style="width: 100%" v-loading="dialogListLoading" border>
                 <el-table-column label="序号" width="100" align="center" prop="id"></el-table-column>
-                <el-table-column label="姓名" align="center" prop="nickName"></el-table-column>
-                <el-table-column label="手机号" align="center" prop="phone"></el-table-column>
+                <el-table-column label="姓名" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.nickName||'--' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="手机号" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.phone||'--' }}
+                    </template>
+                </el-table-column>
             </el-table>
             <div style="margin-top: 20px;text-align: right;">
                 <el-pagination background @size-change="handleSizeChangeDialog"
@@ -109,7 +117,7 @@ import { formatDate } from "@/utils/date";
 const defaultListQuery = {
     pageNum: 1,
     pageSize: 10,
-    admin_user_id: null,
+    userId: null,
     nickName: null,
     phone: null,
     registerStartTime: '',
@@ -118,7 +126,7 @@ const defaultListQuery = {
 const dialogDefaultListQuery = {
     pageNum: 1,
     pageSize: 10,
-    admin_user_id: null,
+    userId: null,
 };
 export default {
     name: "userList",
@@ -164,6 +172,7 @@ export default {
     methods: {
         // 设置分销
         get_settingType(idnex, row) {
+            if(row.phone===null) return this.$message.warning("手机号为空，不可设置");
             this.$confirm("是否确认?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -191,8 +200,8 @@ export default {
 
         // 查看绑定用户
         checkBindUser(index, row) {
-            this.listQuery.admin_user_id = row.id;
-            this.dialogListQuery.admin_user_id = row.id;
+            this.listQuery.userId = row.id;
+            this.dialogListQuery.userId = row.id;
             this.forbiddenDialogVisible = true;
             this.getList();
         },
@@ -200,7 +209,7 @@ export default {
             this.listQuery = Object.assign({}, defaultListQuery);
         },
         handleSearchList() {
-            this.listQuery.admin_user_id = null
+            this.listQuery.userId = null
             this.listQuery.pageNum = 1;
             this.getList();
         },
@@ -227,11 +236,11 @@ export default {
         handleClose() {
             this.forbiddenDialogVisible = false;
             this.dialogListQuery.pageNum = 1;
-            this.listQuery.admin_user_id = null
+            this.listQuery.userId = null
         },
 
         getList() {
-            if (this.listQuery.admin_user_id == null) {
+            if (this.listQuery.userId == null) {
                 this.listLoading = true;
                 userList(this.listQuery).then((response) => {
                     this.listLoading = false;
@@ -251,8 +260,9 @@ export default {
 };
 </script>
 <style scoped>
-.icon {
-    width: 60px;
-    height: 60px;
+.tips{
+    font-size: 14px;
+    color: red;
+    margin-left: 20px;
 }
 </style>

src/views/layout/components/Sidebar/index.vue

@@ -8,7 +8,7 @@
       background-color="#304156"
       text-color="#bfcbd9"
       active-text-color="#409EFF"
-      :unique-opened="false"
+      unique-opened
     >
       <sidebar-item :routes="routes"></sidebar-item>
     </el-menu>

src/views/login/index.vue

@@ -110,7 +110,7 @@
               this.loading = false;
               setCookie("username",this.loginForm.username,15);
               setCookie("password",this.loginForm.password,15);
-              this.$router.push({path: '/channel'})
+              this.$router.push({path: '/distribution/userList'})
             }).catch(() => {
               this.loading = false
             })