20241205测试版本 -zzx

package.json

@@ -2,7 +2,7 @@
   "name": "channel-admin",
   "version": "1.0.0",
   "description": "channel后台管理前端",
-  "author": "macro",
+  "author": "tigerzouzx@foxmail.com",
   "private": true,
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",

src/permission.js

@@ -1,46 +1,51 @@
-import router from './router'
-import store from './store'
-import NProgress from 'nprogress' // Progress 进度条
-import 'nprogress/nprogress.css'// Progress 进度条样式
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // 验权
+import router from "./router";
+import store from "./store";
+import NProgress from "nprogress"; // Progress 进度条
+import "nprogress/nprogress.css"; // Progress 进度条样式
+import { Message } from "element-ui";
+import { getToken } from "@/utils/auth"; // 验权
 
-const whiteList = ['/login'] // 不重定向白名单
+const whiteList = ["/login"]; // 不重定向白名单
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done() // 如果当前页面是 dashboard 后不会触发 AfterEach 钩子，所以手动处理
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done(); // if current page is dashboard will not trigger	afterEach hook, so manually handle it
     } else {
       if (store.getters.roles.length === 0) {
-        store.dispatch('GetInfo').then(res => { // 拉取用户信息
-          let menus=res.data.menus;
-          let username=res.data.username;
-          store.dispatch('GenerateRoutes', { menus,username }).then(() => { // 生成可访问的路由表
-            router.addRoutes(store.getters.addRouters); // 动态添加可访问路由表
-            next({ ...to, replace: true })
+        store
+          .dispatch("GetInfo")
+          .then((res) => {
+            // 拉取用户信息
+            let menus = res.data.menus;
+            let username = res.data.username;
+            store.dispatch("GenerateRoutes", { menus, username }).then(() => {
+              // 生成可访问的路由表
+              router.addRoutes(store.getters.addRouters); // 动态添加可访问路由表
+              next({ ...to, replace: true });
+            });
           })
-        }).catch((err) => {
-          store.dispatch('FedLogOut').then(() => {
-            Message.error(err || 'Verification failed, please login again')
-            next({ path: '/' })
-          })
-        })
+          .catch((err) => {
+            store.dispatch("FedLogOut").then(() => {
+              Message.error(err || "Verification failed, please login again");
+              next({ path: "/" });
+            });
+          });
       } else {
-        next()
+        next();
       }
     }
   } else {
     if (whiteList.indexOf(to.path) !== -1) {
-      next()
+      next();
     } else {
-      next('/login')
-      NProgress.done()
+      next("/login");
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done() // 结束Progress
-})
+  NProgress.done(); // 结束Progress
+});

src/store/modules/cache.js

@@ -1,31 +1,25 @@
 // 引入localStorage
 const state = {
-  cachedData: JSON.parse(localStorage.getItem("cachedData")) || {},
   isAdmin: parseInt(localStorage.getItem("isAdmin")) || null,
 };
 
 const mutations = {
-  setCachedData(state, data) {
-    state.cachedData = data;
-    localStorage.setItem("cachedData", JSON.stringify(data));
-  },
   setIsAdmin(state, isAdmin) {
     if (isAdmin === null) {
-        state.isAdmin = null;
-        localStorage.removeItem('isAdmin');
+      state.isAdmin = null;
+      localStorage.removeItem("isAdmin");
     } else {
-        state.isAdmin = parseInt(isAdmin);
-        localStorage.setItem('isAdmin', isAdmin.toString());
+      state.isAdmin = parseInt(isAdmin);
+      localStorage.setItem("isAdmin", isAdmin.toString());
     }
-},
-
+  },
 };
 
 // 取
 const getters = {
   getIsAdmin: (state) => {
     return state.isAdmin;
-}
+  },
 };
 
 export default {

src/utils/request.js

@@ -56,7 +56,7 @@ service.interceptors.response.use(
             });
           });
         }
-        return Promise.reject("error");
+        // return Promise.reject("error");
       } else {
         return response.data;
       }
@@ -81,15 +81,16 @@ service.interceptors.response.use(
               location.reload();
             });
           });
+        }else{
+          Message({
+            message: error.message,
+            type: "error",
+            duration: 3 * 1000,
+          });
         }
       }
     }
     console.log("err" + error); // for debug
-    Message({
-      message: error.message,
-      type: "error",
-      duration: 3 * 1000,
-    });
     return Promise.reject(error);
   }
 );

src/views/channel/upCheck/index.vue

@@ -4,7 +4,7 @@
  * @Author: zzx
  * @Date: 2024-11-09 16:08:16
  * @LastEditors: zzx
- * @LastEditTime: 2024-11-19 16:08:16
+ * @LastEditTime: 2024-12-05 16:08:16
 -->
 <template>
     <div class="app-container">
@@ -44,15 +44,10 @@
                 <el-table-column label="渠道名称" align="center" prop="ecName"></el-table-column>
                 <el-table-column label="渠道上账金额/元" align="center">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.type==1">{{ scope.row.money||"--" }}</span>
-                        <span v-if="scope.row.type==2">{{ '-'+scope.row.money||"--" }}</span>
+                        <span v-if="scope.row.type==1" style="color:#15BD39;">{{ scope.row.money||"--" }}</span>
+                        <span v-if="scope.row.type==2" style="color: #FE9900;">{{ '-'+scope.row.money||"--" }}</span>
                     </template>
                 </el-table-column>
-                <!-- <el-table-column label="凭证" align="center" prop="updateBy">
-                    <template slot-scope="scope">
-                        <img class="icon" :src="scope.row.voucherPic" alt="">
-                    </template>
-                </el-table-column> -->
                 <el-table-column label="操作人" align="center" prop="updateBy"></el-table-column>
                 <el-table-column label="操作时间" width="160" align="center" prop="createTime"></el-table-column>
             </el-table>

src/views/channel/useCondition/index.vue

@@ -268,7 +268,7 @@ export default {
         },
 
         handleDialogConfirm() {
-            this.$refs.admin.validate(valid => {
+            this.$refs.adminForm.validate(valid => {
                 if (valid) {
                     this.$confirm("是否要确认?", "提示", {
                         confirmButtonText: "确定",

src/views/distribution/peopleManage/index.vue

@@ -54,7 +54,7 @@
                 <el-table-column label="分销员编号" width="100" align="center" prop="number"></el-table-column>
                 <el-table-column label="分销员姓名" align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.userName }}
+                        {{ scope.row.userName||'--' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="分销员层级" align="center">
@@ -65,9 +65,21 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="手机号" align="center" prop="phone"></el-table-column>
-                <el-table-column label="身份证号码" align="center" prop="card"></el-table-column>
-                <el-table-column label="银行卡号" align="center" prop="bankCard"></el-table-column>
-                <el-table-column label="开户行" align="center" prop="depositBank"></el-table-column>
+                <el-table-column label="身份证号码" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.card||'--' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="银行卡号" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.bankCard||'--' }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="开户行" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.depositBank||'--' }}
+                    </template>
+                </el-table-column>
                 <!-- <el-table-column label="佣金比例%" align="center" prop="level"></el-table-column> -->
                 <el-table-column label="更新人" align="center" prop="updateBy"></el-table-column>
                 <el-table-column label="更新时间" align="center" prop="updateTime"></el-table-column>
@@ -130,9 +142,6 @@
                 <el-form-item label="开户行：" prop="depositBank">
                     <el-input v-model="admin.depositBank" type="text" :rows="5" style="width: 250px"></el-input>
                 </el-form-item>
-                <el-form-item label="佣金比例：">
-                    <el-input disabled v-model="admin.level" type="text" :rows="5" style="width: 250px"></el-input>
-                </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="cancelEdit" size="small">取 消</el-button>

src/views/distribution/peopleManage/junior.vue

@@ -14,7 +14,11 @@
         <div class="table-container">
             <el-table ref="adminTable" :data="list" style="width: 100%" v-loading="juniorListLoading" border>
                 <el-table-column label="分销员编号" width="100" align="center" prop="number"></el-table-column>
-                <el-table-column label="分销员姓名" align="center" prop="userName"></el-table-column>
+                <el-table-column label="分销员姓名" align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.userName||'--' }}
+                    </template>
+                </el-table-column>
                 <el-table-column label="分销员层级" align="center">
                     <template slot-scope="scope">
                         <el-tag v-if="scope.row.type == 1 || scope.row.type == null" type="info">普通用户</el-tag>
@@ -34,11 +38,6 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="开户行" align="center" prop="depositBank"></el-table-column>
-                <el-table-column label="操作" align="center" prop="level">
-                    <template slot-scope="scope">
-                        <el-button size="mini" type="warning" plain @click="settingsCommission(scope.row)">设置分销佣金</el-button>
-                    </template>
-                </el-table-column>
             </el-table>
         </div>
         <div class="pagination-container">
@@ -71,14 +70,6 @@ export default {
         this.getList();
     },
     methods: {
-        settingsCommission(row){
-            this.$router.push({
-                name: "setCommission",
-                query: {
-                    adminUserId: row.adminUserId,
-                }
-            })
-        },
         juniorhandleSizeChange(val) {
             this.juniorQuery.pageNum = 1;
             this.juniorQuery.pageSize = val;

src/views/distribution/statistics/index.vue

@@ -50,17 +50,14 @@
                 <el-table-column label="用户购券金额/元" align="center" prop="userTopAllMoney"></el-table-column>
                 <el-table-column label="待清算金额/元" align="center" prop="unconsumedMoney"></el-table-column>
                 <el-table-column label="用户退款金额/元" align="center" prop="userRefundAllMoney"></el-table-column>
+                <el-table-column label="未提现佣金/元" align="center" prop="unWithdrawMoney"></el-table-column>
                 <el-table-column label="待结算佣金/元" align="center">
                     <template slot-scope="scope">
-                        <!-- <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.unSettleAccountMoney ||
-                            '0' }}</span> -->
                         {{ scope.row.unSettleAccountMoney || '0' }}
                     </template>
                 </el-table-column>
                 <el-table-column label="已结算佣金/元" align="center">
                     <template slot-scope="scope">
-                        <!-- <span class="pushRecords" @click="pushRecords(scope.row)">{{ scope.row.settleAccountMoney ||
-                            '0' }}</span> -->
                         {{ scope.row.settleAccountMoney || '0' }}
                     </template>
                 </el-table-column>
@@ -85,7 +82,7 @@
                 <el-descriptions-item label="分销员姓名">{{ dialogQuery.userName }}</el-descriptions-item>
                 <el-descriptions-item label="分销员手机号">{{ dialogQuery.phone }}</el-descriptions-item>
                 <el-descriptions-item label="本次提现订单数/笔">{{ dialogQuery.orderCount || '--' }}</el-descriptions-item>
-                <el-descriptions-item label="本次提现金额/元">{{ dialogQuery.unSettleAccountMoney }}</el-descriptions-item>
+                <el-descriptions-item label="本次提现金额/元">{{ dialogQuery.unWithdrawMoney }}</el-descriptions-item>
             </el-descriptions>
             <div style="margin-top: 10px;font-size: 14px;color: #F4B01D ;">说明:提现的订单为今天( {{ new
                 Date().toLocaleDateString() }}
@@ -186,6 +183,7 @@ export default {
                     "用户购券金额/元": item.userTopAllMoney,
                     "待清算佣金/元": item.unconsumedMoney,
                     "用户退款金额/元": item.userRefundAllMoney,
+                    "未提现佣金/元": item.unWithdrawMoney,
                     "待结算佣金/元": item.unSettleAccountMoney,
                     "已结算佣金/元": item.settleAccountMoney,
                 }

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: '/'})
+              this.$router.push({path: '/'}).catch(() =>{})
             }).catch(() => {
               this.loading = false
             })