Merge branch 'test' of https://git.yidian-inc.com:8021/bp/op-web-service into test

README.md

@@ -37,7 +37,7 @@ npm run web-dev
 
 
 # 部署发布流程
-## 测试环境（http://clay.yidian-inc.com）
+## 测试环境（http://venus.int.yidian-inc.com:8055）
 待提测代码push test分支。对应下列三个job 打包部署测试环境
 - 1. bp-op-web-service-branch-commit
 - 2. bp-op-web-service-branch-assemble

jest.config.js

+/*
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+module.exports = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/5p/f45l166j057533bqfd5n9w880000gp/T/jest_dy",
+
+  // Automatically clear mock calls and instances between every test
+  clearMocks: true,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  // collectCoverage: false,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  // coverageDirectory: undefined,
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: "v8",
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  moduleFileExtensions: ["js", "json", "vue"],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  moduleNameMapper: {
+    "@/(.*)$": "<rootDir>/src/$1"
+  },
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  // preset: undefined,
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state between every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state between every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  testEnvironment: "jsdom",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+  // testURL: "http://localhost",
+
+  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+  // timers: "real",
+
+  // A map from regular expressions to paths to transformers
+  transform: {
+    "^.+\\.vue$": "vue3-jest",
+    "^.+\\.js$": "babel-jest"
+  }
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};

package.json

@@ -34,6 +34,7 @@
     "vuex": "^4.0.0-beta.4"
   },
   "devDependencies": {
+    "@testing-library/vue": "^6.4.2",
     "@vue/cli-plugin-babel": "^4.5.6",
     "@vue/cli-plugin-eslint": "^4.5.6",
     "@vue/cli-plugin-unit-jest": "^4.5.6",
@@ -42,15 +43,18 @@
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/test-utils": "^2.0.0-alpha.1",
     "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
     "cross-env": "^7.0.3",
     "eslint": "^6.7.2",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^7.0.0-alpha.0",
+    "jest": "^27.0.6",
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
     "nodemon": "^2.0.7",
     "pm2": "3.5.1",
-    "prettier": "^1.19.1"
+    "prettier": "^1.19.1",
+    "vue3-jest": "^27.0.0-alpha.1"
   },
   "browserslist": [
     "> 1%",

server/controllers/utils.js

@@ -9,7 +9,7 @@ exports.getUserPermission = async (ctx) => {
     url,
     method: "GET",
     qs: {
-      //user_email: "jianghaiming@126.com"
+      // user_email: "jianghaiming@126.com"
       user_email: user
     }
   };

server/controllers/withdrawal.js

+const WITHDRAWAL_URI = require("../config").WITHDRAWAL_URI;
+const req = require("../utils/request").httpReq;
+// const controller_utils = require('./utils')
+
+/**
+ * 示例
+ *  exports.方法名 = async ctx => {
+ *    const url = `${设置好的域名}/向服务端发送的请求地址`;
+ *    const opts = {
+ *      url,
+ *      method:"发送什么请求"，
+ *      qs: ctx.request.query （get请求的参数）
+ *      body：ctx.request.body （post请求的参数）
+ *      json：boolean (是否转换为json)
+ *    };
+ *    ctx.body = await req(ctx,opts); 将发送请求后的数据传递给前端页面
+ *  };
+ */
+// 获取提现审核列表
+exports.getApplyList = async ctx => {
+    const url = `${WITHDRAWAL_URI}/wallet/background/apply_list`;
+    const opts = {
+        url,
+        method: "GET",
+        qs: ctx.request.query
+    };
+    ctx.body = await req(ctx, opts);
+};
+// 获取黑名单冻结账户
+exports.getBlackList = async ctx => {
+    const url = `${WITHDRAWAL_URI}/wallet/background/blacklist`;
+    const opts = {
+        url,
+        method: "POST",
+        json: true,
+        body: ctx.request.body
+    };
+    ctx.body = await req(ctx, opts);
+};
+// 获取通过、拒绝订单审核
+exports.getWithdrawAudit = async ctx => {
+    const url = `${WITHDRAWAL_URI}/wallet/background/withdraw_audit`;
+    const opts = {
+        url,
+        method: "POST",
+        json: true,
+        body: ctx.request.body,
+        timeout: 10000
+    }
+    ctx.body = await req(ctx, opts)
+}
+// 获取提现失败冻结
+exports.getFreezingFund = async ctx => {
+    const url = `${WITHDRAWAL_URI}/wallet/background/back_freezing_fund`;
+    const opts = {
+        url,
+        method: "POST",
+        json: true,
+        body: ctx.request.body
+    }
+    ctx.body = await req(ctx, opts)
+}
+// 获取提现审核详情
+exports.getApplyDetail = async ctx => {
+    const url = `${WITHDRAWAL_URI}/wallet/background/apply_detail`;
+    const opts = {
+        url,
+        method: "GET",
+        qs: ctx.request.query
+    }
+    ctx.body = await req(ctx, opts)
+}
+
+const getUserPermission = async (ctx) => {
+    const url = `${WITHDRAWAL_URI}/merchant/authority/get_role_list`;
+    const { email, op_cur_user } = ctx.request.query;
+    const user = email || op_cur_user;
+    const opts = {
+      url,
+      method: "GET",
+      qs: {
+        // user_email: "jianghaiming@126.com"
+        user_email: user
+      }
+    };
+    return await req(ctx, opts);
+  }
+  exports.getAll_role_list = async (ctx, next) => {
+    ctx.body = await getUserPermission(ctx);
+  }
\ No newline at end of file

server/router.js

@@ -6,6 +6,7 @@ const enterprise = require("./controllers/enterprise");
 const role = require('./controllers/role')
 const life = require('./controllers/life-no');
 const goods = require('./controllers/goods');
+const withdrawal = require('./controllers/withdrawal');
 const groupmeal = require('./controllers/groupmeal');
 
 const router = Router();
@@ -80,4 +81,11 @@ router.get(`${API_VERSION}/order/background/order_item_list`, groupmeal.orderIte
 router.get(`${API_VERSION}/order/background/order_refund_reject`, groupmeal.orderRefundReject);
 router.post(`${API_VERSION}/order/background/order_refund`, groupmeal.orderRefund);
 
+// 钱包提现审核 wallet/background/apply_detail
+router.get(`${API_VERSION}/get_withdrawal_apply_list`, withdrawal.getApplyList)
+router.post(`${API_VERSION}/get_withdrawal_black_list`, withdrawal.getBlackList)
+router.post(`${API_VERSION}/get_withdraw_audit`, withdrawal.getWithdrawAudit)
+router.post(`${API_VERSION}/get_freezing_fund`, withdrawal.getFreezingFund)
+router.get(`${API_VERSION}/get_apply_detail`, withdrawal.getApplyDetail)
+
 module.exports = router;

server/utils/request.js

 const request = require("request");
 
 exports.httpReq = (ctx, opts) => {
-  opts.timeout = opts.timeout || 1000;
+  opts.timeout = opts.timeout || 10000;
   return new Promise((resolve, reject) => {
     var time_start = +new Date();
 
@@ -18,7 +18,8 @@ exports.httpReq = (ctx, opts) => {
 
     request(opts, (err, res, body) => {
       console.info(
-        `[Api] httpReq (${opts.url}, user:[${opts.qs.op_cur_user
+        `[Api] httpReq (${opts.url}, user:[${
+          opts.qs.op_cur_user
         }]) spent: ${+new Date() - time_start}ms`
       );
 
@@ -31,5 +32,3 @@ exports.httpReq = (ctx, opts) => {
     });
   });
 };
-
-

src/App.vue

@@ -10,24 +10,26 @@
 </template>
 
 <script>
-import { fetchCurrentUser } from './service/user';
-import { redirectToLogin } from './utils/util';
+import { fetchCurrentUser } from "./service/user";
+import { redirectToLogin } from "./utils/util";
 
 export default {
-  async mounted () {
-    console.log("master debug 2 !!!!!!")
-    if (this.$store.state.permissions && this.$store.state.userInfo) return
+  async created() {
+    console.log("master debug 2 !!!!!!");
+    if (this.$store.state.permissions && this.$store.state.userInfo) return;
     const { status, user } = await fetchCurrentUser();
-    if (status === 'success') {
-      this.$store.commit('updateUserInfo', user);
-      this.$store.dispatch('updateUserPermission', { email: user.email })
+    if (status === "success") {
+      this.$store.commit("updateUserInfo", user);
+      this.$store.dispatch("updateUserPermission", { email: user.email });
+      // 无奈之举，后期需要重构到提现管理中
+      this.$store.dispatch("fetchPermission", {
+        appId: "merchant-op-auditing",
+      });
     } else {
       redirectToLogin();
     }
   },
 };
-
-
 </script>
 
 <style lang="less" src="./global.less"></style>

src/components/Pagination/index.vue

@@ -24,7 +24,7 @@ export default {
   },
   data () {
     return {
-      currentPage: 5
+      currentPage: 1
     }
   },
   methods: {

src/components/Roles/RoleDetail.vue

+<template>
+  <div class="user-detail">
+    <el-page-header @back="goBack" content="角色详情页面"> </el-page-header>
+    <el-card class="management">
+      <h5 style="margin-bottom: 10px">角色信息</h5>
+      <el-descriptions class="margin-top" :column="2" border>
+        <el-descriptions-item>
+          <template #label> ID </template>
+          {{ roleId }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label> 角色状态 </template>
+          {{
+            role_info_detail.role_status == 1
+              ? "正常"
+              : role_info_detail.role_status == 2
+              ? "禁用"
+              : "删除"
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label> 角色名称 </template>
+          {{ role_info_detail.role_name }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label> 创建人账号 </template>
+          {{ role_info_detail.create_user_name }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label> 创建时间 </template>
+          {{ role_info_detail.create_time }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label> 最后修改人账号 </template>
+          {{ role_info_detail.update_user_name }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label> 最后修改时间 </template>
+          {{ role_info_detail.update_time }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <div class="tree" v-if="selectedOptions">
+        <h5 style="margin-bottom: 10px">角色范围</h5>
+        <div>
+          <el-cascader
+            v-model="selectedOptions"
+            :options="permissionsAll"
+            placeholder="暂无数据"
+            disabled
+            :props="props"
+            style="width: 300px"
+          ></el-cascader>
+        </div>
+      </div>
+      <div v-if="role_info_detail.role_account_list.length">
+        <h5 style="margin: 10px 0">角色账号</h5>
+        <div class="roleList">
+          <div
+            class="role_account_list"
+            v-for="(item, index) in role_info_detail.role_account_list"
+            :key="index"
+          >
+            {{ item }}
+          </div>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+import {
+  get_role_info as reqGet_role_info,
+  getAll_role_list as reqGetAll_role_list,
+} from "../../service/role";
+export default {
+  name: "RoleDetail",
+  props: ["appId"],
+  data() {
+    return {
+      roleId: this.$route.query.roleId,
+      props: {
+        multiple: true, //设置为多选
+        value: "id", //value值和哪个值绑定
+        label: "desc", //label值和哪个值绑定
+        children: "sub_permissions", //children值和哪个值绑定
+      },
+      selectedOptions: [],
+      permissionsAll: [],
+      role_info_detail: {
+        //详情非编辑项
+        role_id: "",
+        role_name: "",
+        role_status: "",
+        update_time: "",
+        update_user_name: "",
+        create_time: "",
+        create_user_name: "",
+        role_account_list: [],
+      },
+    };
+  },
+  mounted() {
+    this.roleId = this.$route.query.roleId;
+    let { email } = this.$store.state.userInfo;
+    reqGetAll_role_list(email, this.appId).then((res) => {
+      this.permissionsAll = res.permissions;
+    });
+    reqGet_role_info(this.roleId, this.appId).then((res) => {
+      const {
+        role_name,
+        role_status,
+        update_time,
+        update_user_name,
+        create_time,
+        create_user_name,
+        role_account_list,
+        permissions,
+      } = res.result;
+      this.role_info_detail = {
+        role_name,
+        role_status,
+        update_time,
+        update_user_name,
+        create_time,
+        create_user_name,
+        role_account_list,
+      };
+      this.editEchoData(permissions);
+    });
+  },
+  methods: {
+    goBack() {
+      this.$router.back(-1);
+    },
+    //遍历回显值selectedOptions
+    editEchoData(permissions) {
+      let selectData = [];
+      permissions.map((item) => {
+        let one = { id: item.id };
+        if (item.sub_permissions) {
+          item.sub_permissions.map((info) => {
+            let selectId = [one.id, info.id];
+            selectData.push(selectId);
+          });
+        }
+      });
+      this.selectedOptions = selectData;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.user-detail {
+  margin: 50px;
+  .role_account_list {
+    padding: 10px;
+    color: #909399;
+    background: #fafafa;
+    font-weight: 400;
+    line-height: 1.5;
+  }
+  .management {
+    margin-top: 20px;
+  }
+  .roleList {
+    max-height: 300px;
+    overflow-y: scroll;
+  }
+  .tree {
+    // border: 1px solid #ebeef5;
+    margin-top: 20px;
+  }
+}
+</style>

src/components/UserList/components/UserInfoEditModal.vue

+<template>
+  <div class="user-container">
+    <el-dialog title="编辑用户" v-model="modalVisable" :before-close="cancel">
+      <el-form :model="userInfo">
+        <el-form-item label="用户ID" :label-width="formLabelWidth">
+          <el-input
+            class="form-val"
+            v-model="userInfo.user_id"
+            size="medium"
+            disabled
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="状态" :label-width="formLabelWidth">
+          <!-- <el-input class="form-val">{{data.user_status===1?'启用':'禁用'}}</el-input> -->
+          <el-switch
+            class="form-val"
+            v-model="userInfo.user_status"
+            active-value="1"
+            inactive-value="2"
+            active-text="启用"
+            inactive-text="禁用"
+          >
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="姓名" :label-width="formLabelWidth">
+          <el-input
+            class="form-val"
+            v-model="userInfo.user_name"
+            disabled
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱" :label-width="formLabelWidth" required>
+          <el-input
+            class="form-val"
+            v-model="userInfo.user_email"
+            disabled
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" :label-width="formLabelWidth">
+          <el-input class="form-val" v-model="userInfo.user_mobile"></el-input>
+        </el-form-item>
+        <el-form-item label="所属组织" :label-width="formLabelWidth">
+          <el-input
+            class="form-val"
+            v-model="userInfo.organization"
+            disabled
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="授权角色信息"
+          :label-width="formLabelWidth"
+          required
+        >
+          <el-select
+            v-model="userInfo.roles"
+            multiple
+            placeholder="请选择"
+            class="form-val"
+          >
+            <el-option
+              v-for="item in roles"
+              :key="item.role_id"
+              :label="item.role_name"
+              :value="item.role_id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="敏感词权限" :label-width="formLabelWidth">
+          <el-switch
+            v-model="userInfo.is_sensitive_authority"
+            class="form-val"
+            active-value="1"
+            inactive-value="2"
+            active-text="开启"
+            inactive-text="关闭"
+          >
+          </el-switch>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="confirm">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { ElMessage } from "element-plus";
+
+import { getRole_list as reqGetRoles } from "@/service/role";
+
+export default {
+  name: "UserInfoEditModal",
+  props: {
+    data: Object,
+    visable: {
+      type: Boolean,
+      default: false
+    },
+    appId: String
+  },
+  data() {
+    return {
+      formLabelWidth: "120px",
+      userInfo: {},
+      roles: [],
+      modalVisable: false
+    };
+  },
+  watch: {
+    data(val) {
+      this.userInfo = JSON.parse(JSON.stringify(val));
+      this.userInfo.roles = val.roles.map(ele => ele.role_id);
+      this.userInfo.user_status = val.user_status.toString();
+      this.userInfo.is_sensitive_authority = val.is_sensitive_authority.toString();
+    },
+    visable(val) {
+      this.modalVisable = val;
+    }
+  },
+  beforeMount() {
+    this.getRoles();
+  },
+  methods: {
+    async getRoles() {
+      const { code, result } = await reqGetRoles(
+        { page_size: 2000, page: 1 },
+        this.appId
+      );
+      if (code !== 0) {
+        ElMessage.error("获取角色列表出错！");
+        return;
+      }
+      this.roles = result;
+    },
+    confirm() {
+      const checkConditions = {
+        user_email: {
+          check: val => val.trim() !== "",
+          tip: "请输入邮箱！"
+        },
+        roles: {
+          check: val => val.length !== 0,
+          tip: "请添加角色！"
+        }
+      };
+
+      const keys = Object.keys(checkConditions);
+      for (let i = 0; i < keys.length; i++) {
+        const field = keys[i];
+        if (!checkConditions[field].check(this.userInfo[field])) {
+          ElMessage.error(checkConditions[field].tip);
+          return;
+        }
+      }
+
+      this.$emit("confirm", this.userInfo);
+    },
+    cancel() {
+      this.$emit("cancel");
+    }
+  }
+};
+</script>
+<style lang="less">
+.form-val {
+  margin-left: 20px;
+  width: 300px;
+}
+.form-val.el-input {
+  width: 80%;
+}
+</style>

src/components/UserList/components/UserInfoModal.vue

+<template>
+  <div class="user-container">
+    <el-dialog :title="title" v-model="modalVisable" :before-close="cancel">
+      <el-form :model="data">
+        <el-form-item label="用户ID" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.user_id }}</text>
+        </el-form-item>
+        <el-form-item label="状态" :label-width="formLabelWidth">
+          <text class="form-val">{{
+            data.user_status == 1 ? "启用" : "禁用"
+          }}</text>
+        </el-form-item>
+        <el-form-item label="姓名" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.user_name }}</text>
+        </el-form-item>
+        <el-form-item label="账号" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.user_email }}</text>
+        </el-form-item>
+        <el-form-item label="手机号" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.user_mobile }}</text>
+        </el-form-item>
+        <el-form-item label="所属组织" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.organization }}</text>
+        </el-form-item>
+        <el-form-item label="添加账号人" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.create_user_name }}</text>
+        </el-form-item>
+        <el-form-item label="添加时间" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.create_time }}</text>
+        </el-form-item>
+        <el-form-item label="最后修改人账号" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.update_user_name }}</text>
+        </el-form-item>
+        <el-form-item label="最后修改时间" :label-width="formLabelWidth">
+          <text class="form-val">{{ data.update_time }}</text>
+        </el-form-item>
+
+        <el-form-item label="授权角色信息" :label-width="formLabelWidth">
+          <text class="form-val">{{
+            data.roles.map(ele => ele.role_name).join(",")
+          }}</text>
+        </el-form-item>
+        <el-form-item label="敏感词权限" :label-width="formLabelWidth">
+          <text class="form-val">{{
+            data.is_sensitive_authority === 1 ? "是" : "否"
+          }}</text>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: "UserInfoModal",
+  props: {
+    mode: {
+      type: String,
+      default: "check"
+    },
+    data: Object,
+    title: {
+      type: String,
+      default: "用户信息"
+    },
+    visable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      formLabelWidth: "180px",
+      modalVisable: false
+    };
+  },
+  watch: {
+    visable(val) {
+      this.modalVisable = val;
+    }
+  },
+  methods: {
+    cancel: function() {
+      this.$emit("cancel");
+    }
+  }
+};
+</script>
+<style lang="less">
+.form-val {
+  margin-left: 20px;
+}
+</style>

src/components/UserList/components/UserInfoNewModal.vue

+<template>
+  <div class="user-container">
+    <el-dialog title="创建用户" v-model="modalVisable" :before-close="cancel">
+      <el-form :model="userInfo">
+        <el-form-item label="状态" :label-width="formLabelWidth">
+          <!-- <el-input class="form-val">{{data.user_status===1?'启用':'禁用'}}</el-input> -->
+          <el-switch
+            class="form-val"
+            v-model="userInfo.user_status"
+            active-value="1"
+            inactive-value="2"
+            active-text="启用"
+            inactive-text="禁用"
+          >
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="姓名" :label-width="formLabelWidth">
+          <el-input class="form-val" v-model="userInfo.user_name"></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱" :label-width="formLabelWidth" required>
+          <el-input class="form-val" v-model="userInfo.user_email"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" :label-width="formLabelWidth">
+          <el-input class="form-val" v-model="userInfo.user_mobile"></el-input>
+        </el-form-item>
+        <el-form-item label="所属组织" :label-width="formLabelWidth">
+          <el-input class="form-val" v-model="userInfo.organization"></el-input>
+        </el-form-item>
+        <el-form-item label="授权角色" :label-width="formLabelWidth" required>
+          <el-select
+            v-model="userInfo.roles"
+            multiple
+            placeholder="请选择"
+            class="form-val"
+          >
+            <el-option
+              v-for="item in roles"
+              :key="item.role_id"
+              :label="item.role_name"
+              :value="item.role_id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="敏感词权限" :label-width="formLabelWidth">
+          <el-switch
+            v-model="userInfo.is_sensitive_authority"
+            class="form-val"
+            active-value="1"
+            inactive-value="2"
+            active-text="开启"
+            inactive-text="关闭"
+          >
+          </el-switch>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="confirm">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { ElMessage } from "element-plus";
+
+import { getRole_list as reqGetRoles } from "@/service/role";
+
+export default {
+  name: "UserInfoEditModal",
+  props: {
+    visable: {
+      type: Boolean,
+      default: false
+    },
+    appId: String
+  },
+  data() {
+    return {
+      formLabelWidth: "120px",
+      userInfo: {
+        user_name: "",
+        user_email: "",
+        is_sensitive_authority: "0",
+        user_mobile: "",
+        roles: [],
+        user_status: "1",
+        organization: ""
+      },
+      roles: [],
+      modalVisable: false
+    };
+  },
+  watch: {
+    visable(val) {
+      this.modalVisable = val;
+      if (val) {
+        this.userInfo = {
+          user_name: "",
+          user_email: "",
+          is_sensitive_authority: "0",
+          user_mobile: "",
+          roles: [],
+          user_status: "1",
+          organization: ""
+        };
+      }
+    }
+  },
+  beforeMount() {
+    this.getRoles();
+  },
+  methods: {
+    async getRoles() {
+      const { code, result } = await reqGetRoles(
+        { page_size: 2000, page: 1 },
+        this.appId
+      );
+      if (code !== 0) {
+        ElMessage.error("获取角色列表出错！");
+        return;
+      }
+      this.roles = result;
+    },
+    confirm() {
+      const checkConditions = {
+        user_email: {
+          check: val => val.trim() !== "",
+          tip: "请输入邮箱！"
+        },
+        roles: {
+          check: val => val.length !== 0,
+          tip: "请添加角色！"
+        }
+      };
+
+      const keys = Object.keys(checkConditions);
+      for (let i = 0; i < keys.length; i++) {
+        const field = keys[i];
+        if (!checkConditions[field].check(this.userInfo[field])) {
+          ElMessage.error(checkConditions[field].tip);
+          return;
+        }
+      }
+
+      this.$emit("confirm", this.userInfo);
+    },
+    cancel() {
+      this.$emit("cancel");
+    }
+  }
+};
+</script>
+<style lang="less">
+.form-val {
+  margin-left: 20px;
+  width: 300px;
+}
+.form-val.el-input {
+  width: 80%;
+}
+</style>

src/components/UserList/index.vue

+<template>
+  <div class="user">
+    <el-form :inline="true" :model="pageParams" class="demo-form-inline">
+      <el-form-item label="用户姓名">
+        <el-input
+          maxlength="15"
+          v-model="pageParams.user_name"
+          placeholder="用户姓名"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="用户账号">
+        <el-input
+          v-model="pageParams.user_email"
+          placeholder="用户账号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="手机号">
+        <el-input
+          v-model="pageParams.user_mobile"
+          placeholder="手机号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-select v-model="pageParams.user_status" placeholder="状态">
+          <el-option value="1" label="启用"></el-option>
+          <el-option value="2" label="禁用"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="func-btn">
+        <el-button type="primary" @click="getUserList">查询</el-button>
+        <el-button @click="onReset">重置</el-button>
+        <el-button @click="createUser" :disabled="!permission.get('create')"
+          >新建用户</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <el-table :data="renderUserList" border style="width: 100%">
+      <el-table-column prop="user_id" label="用户ID" width="70">
+      </el-table-column>
+      <el-table-column prop="user_name" label="用户姓名"> </el-table-column>
+      <el-table-column prop="user_email" label="用户账号"> </el-table-column>
+      <el-table-column prop="user_status" label="状态"> </el-table-column>
+      <el-table-column prop="user_mobile" label="手机号"> </el-table-column>
+      <el-table-column prop="update_time" label="最后修改日期">
+      </el-table-column>
+      <el-table-column prop="update_user_name" label="最后修改人账号">
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="140">
+        <template #default="scope">
+          <el-button type="text" size="small" @click="checkUser(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            @click="editUser(scope.row)"
+            type="text"
+            size="small"
+            :disabled="!permission.get('edit')"
+            >修改</el-button
+          >
+          <el-button
+            v-if="scope.row.user_status === '启用'"
+            type="text"
+            size="small"
+            @click="disableUser(scope.row)"
+            :disabled="!permission.get('enable')"
+            >禁用</el-button
+          >
+          <el-button
+            v-if="scope.row.user_status === '禁用'"
+            type="text"
+            size="small"
+            @click="enableUser(scope.row)"
+            :disabled="!permission.get('disable')"
+            >启用</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <page
+      :totalNum="totalNum"
+      :pageSize="pageParams.size"
+      @update="updatePage"
+    />
+  </div>
+
+  <user-info-modal
+    :data="curUserInfo"
+    :visable="modalVisable.info"
+    @cancel="cancelModal('info')"
+    :appId="appId"
+  ></user-info-modal>
+  <user-info-edit-modal
+    :data="curUserInfo"
+    :visable="modalVisable.edit"
+    @confirm="confirmEditModal"
+    @cancel="cancelModal('edit')"
+    :appId="appId"
+  ></user-info-edit-modal>
+  <user-info-new-modal
+    :visable="modalVisable.new"
+    @confirm="confirmEditModal"
+    @cancel="cancelModal('new')"
+    :appId="appId"
+  ></user-info-new-modal>
+</template>
+
+<script>
+import page from "@/components/Pagination";
+import UserInfoModal from "./components/UserInfoModal";
+import UserInfoEditModal from "./components/UserInfoEditModal";
+import UserInfoNewModal from "./components/UserInfoNewModal";
+import { ElMessage } from "element-plus";
+import {
+  getUserList as reqGetUserList,
+  getUserDetail as reqGetUserDetail,
+  editUser as reqEditUser,
+  createUser as reqCreateUser,
+} from "@/service/user";
+
+export default {
+  name: "UserList",
+  props: ["appId", "userPermissionId"],
+  components: {
+    page,
+    UserInfoModal,
+    UserInfoEditModal,
+    UserInfoNewModal,
+  },
+  data() {
+    return {
+      pageParams: {
+        appid: this.appId,
+        page: 1,
+        size: 20,
+        user_name: "",
+        user_email: "",
+        user_mobile: "",
+        user_status: "",
+      },
+      totalNum: 0,
+      userList: [],
+      curUserInfo: {},
+      modalVisable: {
+        info: false,
+        edit: false,
+        new: false,
+      },
+      curOperateMode: "new",
+    };
+  },
+  computed: {
+    permission() {
+      const appId = this.appId || "";
+      const userPermissionId = this.userPermissionId || "user";
+      const modulePermissions =
+        this.$store.getters.moduleSubPermissions(userPermissionId, appId) || [];
+      console.log("Current page func-permissions:", modulePermissions);
+      return new Map(modulePermissions.map((ele) => [ele.name, true]));
+    },
+
+    renderUserList() {
+      const statusMap = new Map([
+        [1, "启用"],
+        [2, "禁用"],
+        [3, "删除"],
+      ]);
+      return this.userList.map((ele) => {
+        ele.user_status = statusMap.get(ele.user_status);
+        return ele;
+      });
+    },
+  },
+  beforeMount() {
+    this.getUserList();
+  },
+  methods: {
+    async getUserList() {
+      const { code, result } = await reqGetUserList(this.pageParams);
+
+      if (code !== 0) {
+        ElMessage.error("获取用户列表出错！");
+        return;
+      }
+      const { data, count } = result;
+      this.totalNum = count;
+      this.userList = data;
+    },
+
+    async setCurUserInfo(user_id) {
+      const { code, result } = await reqGetUserDetail({
+        appid: this.appId,
+        user_id,
+      });
+      if (code === 0) {
+        this.curUserInfo = {
+          ...result.user_info,
+          roles: result.role_list,
+        };
+      } else {
+        ElMessage.error("获取用户信息出错！");
+      }
+    },
+
+    async checkUser(row) {
+      const { user_id } = row;
+      await this.setCurUserInfo(user_id);
+      this.openModal("info");
+    },
+
+    async editUser(row) {
+      const { user_id } = row;
+      await this.setCurUserInfo(user_id);
+      // this.openModal('edit');
+      this.modalVisable.edit = true;
+      this.curOperateMode = "edit";
+    },
+
+    openModal(key) {
+      Object.keys(this.modalVisable).forEach((ele) => {
+        this.modalVisable[ele] = key === ele;
+      });
+    },
+
+    async confirmEditModal(userInfo) {
+      const {
+        user_id,
+        user_name,
+        user_email,
+        is_sensitive_authority,
+        user_mobile,
+        roles,
+        user_status,
+        organization,
+      } = userInfo;
+
+      let res = {};
+
+      if (this.curOperateMode === "edit") {
+        const editData = {
+          user_id,
+          user_name,
+          user_email,
+          is_sensitive_authority: parseInt(is_sensitive_authority),
+          user_mobile,
+          role_id: roles,
+          user_status: parseInt(user_status),
+        };
+        res = await reqEditUser(editData, this.appId);
+      } else if (this.curOperateMode === "new") {
+        const newData = {
+          user_name,
+          user_email,
+          is_sensitive_authority: parseInt(is_sensitive_authority),
+          user_mobile,
+          role_id: roles,
+          user_status: parseInt(user_status),
+          organization,
+        };
+        res = await reqCreateUser(newData, this.appId);
+      }
+
+      if (res.code === 0) {
+        this.cancelModal(this.curOperateMode);
+        ElMessage.success("更新成功！");
+        this.getUserList();
+      } else {
+        ElMessage.error(res.reason);
+      }
+    },
+
+    cancelModal(name) {
+      this.modalVisable[name] = false;
+    },
+
+    createUser() {
+      this.curOperateMode = "new";
+      this.openModal("new");
+    },
+
+    //重置
+    onReset() {
+      this.pageParams = {
+        appid: this.appId,
+        page: 1,
+        pageSize: 20,
+        user_name: "",
+        user_email: "",
+        user_mobile: "",
+        user_status: "",
+      };
+      this.getUserList();
+    },
+
+    updatePage({ page, pageSize }) {
+      page && (this.pageParams.page = page);
+      pageSize && (this.pageParams.pageSize = pageSize);
+      this.getUserList();
+    },
+
+    async enableUser(row) {
+      const { user_id } = row;
+
+      const { code, reason } = await reqEditUser(
+        {
+          user_status: 1,
+          user_id,
+        },
+        this.appId
+      );
+      if (code === 0) {
+        ElMessage.success("启用成功！");
+        this.getUserList();
+      } else {
+        ElMessage.error(reason);
+      }
+    },
+
+    async disableUser(row) {
+      const { user_id } = row;
+      const { code, reason } = await reqEditUser(
+        {
+          user_status: 2,
+          user_id,
+        },
+        this.appId
+      );
+      if (code === 0) {
+        ElMessage.success("禁用成功！");
+        this.getUserList();
+      } else {
+        ElMessage.error(reason);
+      }
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.user {
+  padding: 50px;
+  .search_life {
+    width: 280px;
+  }
+
+  .func-btn {
+    float: right;
+  }
+}
+</style>

src/config/pageconfig.js

@@ -54,10 +54,10 @@ export const PERMISSIONNAME_PAGEMODULE = (function () {
  * router 用该配置做路由权限拦截。需要增加权限拦截的路由，需在此添加配置。
  */
 export const PATH_PERMISSION_NAME = {
-  '/enterprise/certification': 'enterprise_certification_management',
-  '/enterprise/audit': 'enterprise_certification_management.audit',
-  '/enterprise/establish': 'enterprise_certification_management.create',
-  '/lifeNo': 'life_official_account_management',
-  '/roleManageRole': 'role_management',
-  '/user': 'user_management'
+  '/op/enterprise/certification': 'enterprise_certification_management',
+  '/op/enterprise/audit': 'enterprise_certification_management.audit',
+  '/op/enterprise/establish': 'enterprise_certification_management.create',
+  '/op/lifeNo': 'life_official_account_management',
+  '/op/roleManageRole': 'role_management',
+  '/op/user': 'user_management'
 }
\ No newline at end of file

src/pages/Catch/forbidden.vue

 <template>
   <div>
-    <layout> 没有权限! </layout>
+     没有权限! 
   </div>
 </template>
 
 <script>
-import Layout from '@/layouts';
 export default {
-  components: {
-    Layout,
-  },
+  
 };
 </script>
 

src/pages/Goods/Detail/index.vue

@@ -432,6 +432,7 @@
             v-if="$route.params.operation === 'EDIT'"
             v-model="goodsObj.rule_refund"
             placeholder="请选择"
+            :disabled="goodsObj.audit_status===1"
           >
             <el-option
               v-for="item in rulesForm.rulesOptions"
@@ -681,6 +682,13 @@ export default {
       this.optionsValue = [val.category_1_id, val.category_2_id];
       this.rulesForm.useStartTime = this.formatDate(val.rule_start_time);
       this.rulesForm.useEndTime = this.formatDate(val.rule_end_time);
+      console.log(val.original_price);
+      this.goodsObj.original_price = Number(val.original_price)
+      if (!val.original_price) {
+        this.$nextTick(() => {
+          this.goodsObj.original_price = "";
+        })
+      }
     },
     rejectVisible (val) {
       if (!val) {
@@ -1142,8 +1150,10 @@ export default {
 
     // 更改售价
     salePrice () {
-      if (this.goodsObj.price.length === 0) {
-        this.goodsObj.price = 0;
+      if (!this.goodsObj.price) {
+        this.$nextTick(() => {
+          this.goodsObj.price = "";
+        })
       }
       const parseFloatValue = Number(this.goodsObj.price).toFixed(2);
       this.goodsObj.price = Number(parseFloatValue);
@@ -1151,15 +1161,17 @@ export default {
         typeof this.goodsObj.price === "number" &&
         isNaN(this.goodsObj.price)
       ) {
-        this.goodsObj.price = 0;
+        this.goodsObj.price = "";
         return this.$message.error("售价价格必须为数字");
       }
     },
 
     // 更改原价
     perPrice () {
-      if (this.goodsObj.original_price.length === 0) {
-        this.goodsObj.original_price = 0;
+      if (!this.goodsObj.original_price || this.goodsObj.original_price == 0) {
+        this.$nextTick(() => {
+          this.goodsObj.original_price = "";
+        })
       }
       const parseOriginalPrice = Number(this.goodsObj.original_price).toFixed(
         2
@@ -1169,7 +1181,7 @@ export default {
         typeof this.goodsObj.original_price === "number" &&
         isNaN(this.goodsObj.original_price)
       ) {
-        this.goodsObj.original_price = 0;
+        this.goodsObj.original_price = "";
         return this.$message.error("原价价格必为数字");
       }
     },
@@ -1233,6 +1245,8 @@ export default {
         rule_date_type: this.goodsObj.rule_date_type // 使用日期类型(周末/工作日)
       };
 
+      console.log(111222333, query.original_price);
+
       // 必填校验
       if (!this.goodsObj.goods_spu_id) {
         return this.$message.error("未传入商品id");
@@ -1265,13 +1279,16 @@ export default {
       if (!query.rule_refund) {
         return this.$message.error("请填写退款规则");
       }
-      if (query.original_price.length === 0) {
-        return this.$message.error("请填写原价(保留两位小数)");
+      if (query.original_price === "0") {
+        return this.$message.error("原价价格不得为0");
       }
       if (query.price.length === 0) {
         return this.$message.error("请填写售价(保留两位小数)");
       }
-      if (typeof query.original_price !== "number") {
+      if (query.price == 0) {
+        return this.$message.error("售价价格不得为0");
+      }
+      if (query.original_price && typeof query.original_price !== "number") {
         return this.$message.error("原价价格必须为数字");
       }
       if (typeof query.price !== "number") {

src/pages/Goods/Retail/index.vue

@@ -603,7 +603,6 @@ export default {
               this.ruleForm.goods_spu_id &&
               this.ruleForm.goods_spu_id.join(",");
           }
-          // console.log(goods_sku_id)；
           let {
             marketing_name,
             first_commission_value,

src/pages/Role/role-detail.vue

 <template>
-  <div class="user-detail">
-    <el-page-header @back="goBack" content="角色详情页面"> </el-page-header>
-    <el-card class="management">
-      <h5 style="margin-bottom: 10px">角色信息</h5>
-      <el-descriptions class="margin-top" :column="2" border>
-        <el-descriptions-item>
-          <template #label> ID </template>
-          {{ roleId }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 角色状态 </template>
-          {{
-            role_info_detail.role_status == 1
-              ? "正常"
-              : role_info_detail.role_status == 2
-              ? "禁用"
-              : "删除"
-          }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 角色名称 </template>
-          {{ role_info_detail.role_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 创建人账号 </template>
-          {{ role_info_detail.create_user_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 创建时间 </template>
-          {{ role_info_detail.create_time }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 最后修改人账号 </template>
-          {{ role_info_detail.update_user_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 最后修改时间 </template>
-          {{ role_info_detail.update_time }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <div class="tree" v-if="selectedOptions">
-        <h5 style="margin-bottom: 10px">角色范围</h5>
-        <div>
-          <el-cascader
-            v-model="selectedOptions"
-            :options="permissionsAll"
-            placeholder="暂无数据"
-            disabled
-            :props="props"
-            style="width: 300px"
-          ></el-cascader>
-        </div>
-      </div>
-      <div v-if="role_info_detail.role_account_list.length">
-        <h5 style="margin: 10px 0">角色账号</h5>
-        <div class="roleList">
-          <div
-            class="role_account_list"
-            v-for="(item, index) in role_info_detail.role_account_list"
-            :key="index"
-          >
-            {{ item }}
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
+  <RoleDetail appId="merchant-op" />
 </template>
 <script>
-import { get_role_info as reqGet_role_info, getAll_role_list as reqGetAll_role_list, } from '../../service/role'
+import RoleDetail from "@/components/Roles/RoleDetail";
+
 export default {
-  data () {
-    return {
-      roleId: this.$route.query.roleId,
-      user_info: {
-        name: "jianghaiming",
-        email: "jianghaiming@126.com",
-      },
-      props: {
-        multiple: true,//设置为多选
-        value: 'id', //value值和哪个值绑定
-        label: 'desc',//label值和哪个值绑定
-        children: 'sub_permissions'//children值和哪个值绑定
-      },
-      selectedOptions: [],
-      permissionsAll: [],
-      role_info_detail: {//详情非编辑项
-        role_id: "",
-        role_name: "",
-        role_status: "",
-        update_time: "",
-        update_user_name: "",
-        create_time: "",
-        create_user_name: "",
-        role_account_list: []
+  components: {
+    RoleDetail
   }
-    }
-  },
-  activated () {
-    this.roleId = this.$route.query.roleId
-    let { email } = this.$store.state.userInfo
-    reqGetAll_role_list(email).then(res => {
-      this.permissionsAll = res
-    })
-    reqGet_role_info(this.roleId).then((res) => {
-      const { role_name, role_status, update_time, update_user_name, create_time, create_user_name, role_account_list, permissions } = res
-      this.role_info_detail = {
-        role_name,
-        role_status,
-        update_time,
-        update_user_name,
-        create_time,
-        create_user_name,
-        role_account_list
-      }
-      this.editEchoData(permissions)
-    })
-  },
-  methods: {
-    goBack () {
-      this.$router.back(-1);
-    },
-    //遍历回显值selectedOptions
-    editEchoData (permissions) {
-      let selectData = []
-      permissions.map(item => {
-        let one = { id: item.id }
-        if (item.sub_permissions) {
-          item.sub_permissions.map(info => {
-            let selectId = [one.id, info.id]
-            selectData.push(selectId)
-          })
-        }
-      })
-      this.selectedOptions = selectData
-    },
-  }
-}
+};
 </script>
-<style lang="less" scoped>
-.user-detail {
-  margin: 50px;
-  .role_account_list {
-    padding: 10px;
-    color: #909399;
-    background: #fafafa;
-    font-weight: 400;
-    line-height: 1.5;
-  }
-  .management {
-    margin-top: 20px;
-  }
-  .roleList {
-    max-height: 300px;
-    overflow-y: scroll;
-  }
-  .tree {
-    // border: 1px solid #ebeef5;
-    margin-top: 20px;
-  }
-}
-</style>
\ No newline at end of file

src/pages/User/user-detail.vue

-<template>
-  <div class="user-detail">
-    <el-page-header @back="goBack" content="用户详情页面"> </el-page-header>
-    <el-card class="management">
-      <h2 style="margin-bottom: 10px">用户信息</h2>
-      <el-descriptions class="margin-top" :column="3" :size="size" border>
-        <el-descriptions-item>
-          <template #label> 用户姓名 </template>
-          {{ user_info.user_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 手机号 </template>
-          {{ user_info.user_mobile }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 所属组织 </template>
-          {{ user_info.organization }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 添加人账号 </template>
-          {{ user_info.create_user_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 添加时间 </template>
-          {{ user_info.create_time }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 最后修改人账号 </template>
-          {{ user_info.update_user_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 最后修改时间 </template>
-          {{ user_info.update_user_name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 敏感词权限 </template>
-          {{ user_info.is_sensitive_authority == 1 ? "有" : "无" }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <div class="role">角色信息</div>
-      <el-table :data="role_list" border style="width: 100%">
-        <el-table-column prop="role_id" label="ID" width="180">
-        </el-table-column>
-        <el-table-column prop="role_name" label="角色名称"> </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
-</template>
-<script>
-import { getUser_detail as reqGetUser_detail } from "../../service/user";
-export default {
-  data () {
-    return {
-      user_id: this.$route.query.userId,
-      user_info: {},
-      role_list: []//角色池
-    }
-  },
-  created () {
-    this.getUser_date()
-  },
-  methods: {
-    getUser_date () {
-      reqGetUser_detail(this.user_id).then((res) => {
-        this.user_info = res.user_info
-        this.role_list = res.role_list
-      })
-    },
-    goBack () {
-      this.$router.go(-1)
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.user-detail {
-  margin: 50px;
-  .role {
-    margin: 10px;
-    font-weight: bold;
-  }
-}
-</style>
\ No newline at end of file

src/pages/User/userList/index.vue

-
 <template>
   <layout>
-    <div class="user">
-      <el-form :inline="true" :model="pageParams" class="demo-form-inline">
-        <el-form-item label="用户姓名">
-          <el-input
-            maxlength="15"
-            v-model="pageParams.user_name"
-            placeholder="用户姓名"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="用户账号">
-          <el-input
-            v-model="pageParams.user_email"
-            placeholder="用户账号"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="手机号">
-          <el-input
-            v-model="pageParams.user_mobile"
-            placeholder="手机号"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-select v-model="pageParams.user_status" placeholder="状态">
-            <el-option value="1" label="启用"></el-option>
-            <el-option value="2" label="禁用"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="func-btn">
-          <el-button type="primary" @click="getUserList">查询</el-button>
-          <el-button @click="onReset">重置</el-button>
-          <el-button @click="createUser" :disabled="!permission.get('create')"
-            >新建用户</el-button
-          >
-        </el-form-item>
-      </el-form>
-      <el-table :data="renderUserList" border style="width: 100%">
-        <el-table-column prop="user_id" label="用户ID" width="70">
-        </el-table-column>
-        <el-table-column prop="user_name" label="用户姓名"> </el-table-column>
-        <el-table-column prop="user_email" label="用户账号"> </el-table-column>
-        <el-table-column prop="user_status" label="状态"> </el-table-column>
-        <el-table-column prop="user_mobile" label="手机号"> </el-table-column>
-        <el-table-column prop="update_time" label="最后修改日期">
-        </el-table-column>
-        <el-table-column prop="update_user_name" label="最后修改人账号">
-        </el-table-column>
-        <el-table-column fixed="right" label="操作" width="140">
-          <template #default="scope">
-            <el-button type="text" size="small" @click="checkUser(scope.row)"
-              >查看</el-button
-            >
-            <el-button
-              @click="editUser(scope.row)"
-              type="text"
-              size="small"
-              :disabled="!permission.get('edit')"
-              >修改</el-button
-            >
-            <el-button
-              v-if="scope.row.user_status === '启用'"
-              type="text"
-              size="small"
-              @click="disableUser(scope.row)"
-              :disabled="!permission.get('enable')"
-              >禁用</el-button
-            >
-            <el-button
-              v-if="scope.row.user_status === '禁用'"
-              type="text"
-              size="small"
-              @click="enableUser(scope.row)"
-              :disabled="!permission.get('disable')"
-              >启用</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <page
-        :totalNum="totalNum"
-        :pageSize="pageParams.size"
-        @update="updatePage"
-      />
-    </div>
-
-    <user-info-modal
-      :data="curUserInfo"
-      :visable="modalVisable.info"
-      @cancel="cancelModal('info')"
-    ></user-info-modal>
-    <user-info-edit-modal
-      :data="curUserInfo"
-      :visable="modalVisable.edit"
-      @confirm="confirmEditModal"
-      @cancel="cancelModal('edit')"
-    ></user-info-edit-modal>
-    <user-info-new-modal
-      :visable="modalVisable.new"
-      @confirm="confirmEditModal"
-      @cancel="cancelModal('new')"
-    ></user-info-new-modal>
+    <UserList appId="merchant-op" />
   </layout>
 </template>
 
 <script>
 import Layout from "@/layouts";
-import page from "@/components/Pagination";
-import UserInfoModal from "./components/UserInfoModal";
-import UserInfoEditModal from "./components/UserInfoEditModal";
-import UserInfoNewModal from "./components/UserInfoNewModal";
-import { ElMessage } from "element-plus";
-import {
-  getUserList as reqGetUserList,
-  getUserDetail as reqGetUserDetail,
-  editUser as reqEditUser,
-  createUser as reqCreateUser,
-} from "@/service/user";
+import UserList from "@/components/UserList";
 
 export default {
   components: {
     Layout,
-    page,
-    UserInfoModal,
-    UserInfoEditModal,
-    UserInfoNewModal,
-  },
-  data() {
-    return {
-      pageParams: {
-        page: 1,
-        size: 20,
-        user_name: "",
-        user_email: "",
-        user_mobile: "",
-        user_status: "",
-      },
-      totalNum: 0,
-      userList: [],
-      curUserInfo: {},
-      modalVisable: {
-        info: false,
-        edit: false,
-        new: false,
-      },
-      curOperateMode: "new",
-    };
-  },
-  computed: {
-    permission() {
-      const modulePermissions =
-        this.$store.getters.moduleSubPermissions("user") || [];
-      console.log("Current page func-permissions:", modulePermissions);
-      return new Map(modulePermissions.map((ele) => [ele.name, true]));
-    },
-
-    renderUserList() {
-      const statusMap = new Map([
-        [1, "启用"],
-        [2, "禁用"],
-        [3, "删除"],
-      ]);
-      return this.userList.map((ele) => {
-        ele.user_status = statusMap.get(ele.user_status);
-        return ele;
-      });
-    },
-  },
-  beforeMount() {
-    this.getUserList();
-  },
-  methods: {
-    async getUserList() {
-      const { code, result } = await reqGetUserList(this.pageParams);
-
-      if (code !== 0) {
-        ElMessage.error("获取用户列表出错！");
-        return;
-      }
-      const { data, count } = result;
-      this.totalNum = count;
-      this.userList = data;
-    },
-
-    async setCurUserInfo(user_id) {
-      const { code, result } = await reqGetUserDetail({ user_id });
-      if (code === 0) {
-        this.curUserInfo = {
-          ...result.user_info,
-          roles: result.role_list,
-        };
-      } else {
-        ElMessage.error("获取用户信息出错！");
-      }
-    },
-
-    async checkUser(row) {
-      const { user_id } = row;
-      await this.setCurUserInfo(user_id);
-      this.openModal("info");
-    },
-
-    async editUser(row) {
-      const { user_id } = row;
-      await this.setCurUserInfo(user_id);
-      // this.openModal('edit');
-      this.modalVisable.edit = true;
-      this.curOperateMode = "edit";
-    },
-
-    openModal(key) {
-      Object.keys(this.modalVisable).forEach((ele) => {
-        this.modalVisable[ele] = key === ele;
-      });
-    },
-
-    async confirmEditModal(userInfo) {
-      const {
-        user_id,
-        user_name,
-        user_email,
-        is_sensitive_authority,
-        user_mobile,
-        roles,
-        user_status,
-        organization,
-      } = userInfo;
-
-      let res = {};
-
-      if (this.curOperateMode === "edit") {
-        const editData = {
-          user_id,
-          user_name,
-          user_email,
-          is_sensitive_authority: parseInt(is_sensitive_authority),
-          user_mobile,
-          role_id: roles,
-          user_status: parseInt(user_status),
-        };
-        res = await reqEditUser(editData);
-      } else if (this.curOperateMode === "new") {
-        const newData = {
-          user_name,
-          user_email,
-          is_sensitive_authority: parseInt(is_sensitive_authority),
-          user_mobile,
-          role_id: roles,
-          user_status: parseInt(user_status),
-          organization,
-        };
-        res = await reqCreateUser(newData);
-      }
-
-      if (res.code === 0) {
-        this.cancelModal(this.curOperateMode);
-        ElMessage.success("更新成功！");
-        this.getUserList();
-      } else {
-        ElMessage.error(res.reason);
-      }
-    },
-
-    cancelModal(name) {
-      this.modalVisable[name] = false;
-    },
-
-    createUser() {
-      this.curOperateMode = "new";
-      this.openModal("new");
-    },
-
-    //重置
-    onReset() {
-      this.pageParams = {
-        page: 1,
-        pageSize: 20,
-        user_name: "",
-        user_email: "",
-        user_mobile: "",
-        user_status: "",
-      };
-      this.getUserList();
-    },
-
-    updatePage({ page, pageSize }) {
-      page && (this.pageParams.page = page);
-      pageSize && (this.pageParams.pageSize = pageSize);
-      this.getUserList();
-    },
-
-    async enableUser(row) {
-      const { user_id } = row;
-
-      const { code, reason } = await reqEditUser({ user_status: 1, user_id });
-      if (code === 0) {
-        ElMessage.success("启用成功！");
-        this.getUserList();
-      } else {
-        ElMessage.error(reason);
-      }
-    },
-
-    async disableUser(row) {
-      const { user_id } = row;
-      const { code, reason } = await reqEditUser({ user_status: 2, user_id });
-      if (code === 0) {
-        ElMessage.success("禁用成功！");
-        this.getUserList();
-      } else {
-        ElMessage.error(reason);
+    UserList
   }
-    },
-  },
 };
 </script>
 <style lang="less" scoped>

src/pages/Withdrawal/Examine/__tests__/examine.spec.js

+import { render } from "@testing-library/vue";
+import ExaminePage from "..";
+import { getApplyList } from "@/service/Withdrawal/withdrawal";
+import store from "@/store";
+
+jest.mock("@/service/Withdrawal/withdrawal");
+
+it("should not enable audition for people without such privilege", () => {
+  const $route = {
+    path: "/op/withdrawal/examine"
+  };
+
+  getApplyList.mockResolvedValue({
+    code: 0,
+    status: "success",
+    result: {
+      list: [
+        {
+          withdraw_apply_id: "21072711253403105009",
+          wallet_id: "21072214560673105003",
+          user_id: 510227177373,
+          amount: "6.00",
+          withdraw_apply_status: 0,
+          withdraw_audit_time: "2021-07-27 11:25:34",
+          refuse_reason: "",
+          audit_user_name: "",
+          create_time: "2021-07-27 11:25:34",
+          lately_amount: "0.00",
+          id: "21072711253403105009",
+          city_name: "简网员工",
+          lately_share: 0,
+          lately_download: 0,
+          history_share: 52,
+          history_download: 0,
+          history_download_keep: "0%",
+          status_text: "待审核"
+        }
+      ],
+      count: 1
+    }
+  });
+
+  const { getByText } = render(ExaminePage, {
+    store,
+    global: {
+      mocks: {
+        $route,
+        $store: {
+          getters: {
+            moduleSubPermissions: jest.fn().mockReturnValue(true)
+          }
+        }
+      }
+    }
+  });
+
+  getByText("审核");
+});

src/pages/Withdrawal/Examine/index.less

+
+.tab-show {
+	width: 100%;
+	height: 100%;
+	padding: 0px 55px;
+	background-color: white;
+	.el-tabs__nav-wrap::after {
+		background-color: transparent;
+	}
+	.el-tabs__header {
+		margin: 0;
+	}
+	
+}
+.goods {
+	width: 100%;
+	height: 100%;
+	padding: 0px 30px;
+	
+	.search_condition {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		
+		.search_button {
+			display: flex;
+			align-items: center;
+			justify-self: flex-end;
+			.el-form-item__content {
+				display: flex;
+				justify-content: space-around;
+			}
+		}
+	}
+	.commodity_list {
+		margin-top: 30px;
+	}
+	.pagination {
+		margin-top: 30px;
+	}
+	
+}
+.listShow {
+	// padding-left: 60px;
+	padding-left: 120px;
+	li {
+		width: 100%;
+		padding-bottom: 10px;
+	 .list-left {
+		//  display:inline-block;
+		width: 30%;
+		// text-align: right;
+		padding-right: 10px;
+	}
+	.list-right {
+		display:inline-block;
+		width: 70%;
+	}
+  }
+}
+ .text-area {
+	width: 100%;
+	padding-left: 120px;
+	.el-form-item__label {
+		width: 100%;
+		text-align: left;
+	}
+}
+.dialog-footer {
+	// display: flex;
+	// justify-content: center;
+	// align-items: center;
+	text-align: center;
+}
+.cancel {
+	background-color: #409EFF !important;
+	color: white;
+	border: none;
+}
+.confirm {
+	background-color: #b8b8b8 !important;
+	border: none;
+}
+.el-card__body{
+	padding: 10px;
+}
\ No newline at end of file

src/pages/Withdrawal/Examine/index.vue

@@ -248,7 +248,7 @@
           <el-table-column
             align="center"
             prop="third_order_desc"
-            label="分享额外奖励x.xx元"
+            label="说明"
             width="150"
           >
           </el-table-column>
@@ -535,9 +535,10 @@ export default {
       }
 
       const WITHDRAWAL_PERMISSION_ID = 10;
+      const WITHDRAWAL_PERMISSION_ID1 = 10000005;
 
       let withdrawlPermission = this.permissions.filter(
-        (item) => item.id === WITHDRAWAL_PERMISSION_ID
+        (item) => (item.id === WITHDRAWAL_PERMISSION_ID || item.id === WITHDRAWAL_PERMISSION_ID1)
       );
       // 无此模块权限
       if (withdrawlPermission.length === 0) {
@@ -545,8 +546,9 @@ export default {
       }
 
       const AUDIT_PERMSSION_ID = 14;
+      const AUDIT_PERMSSION_ID1 = 10000014;
       const auditPermission = withdrawlPermission[0].sub_permissions.filter(
-        (item) => item.id === AUDIT_PERMSSION_ID
+        (item) => (item.id === AUDIT_PERMSSION_ID || item.id === AUDIT_PERMSSION_ID1)
       );
 
       return auditPermission.length !== 0;

src/pages/Role/add-role.vue → src/pages/Withdrawal/Role/add-role.vue

@@ -67,14 +67,14 @@
   </div>
 </template>
 <script>
-import page from "../components/Pagination"
+import page from "../../../components/Pagination"
 import roleInfo from './components/roleInfo'
 import {
   getRole_list as reqGetRole_list, getAdd_role as reqGetAdd_role,
   getAll_role_list as reqGetAll_role_list,
   getUpdate_role as reqGetUpdate_role,
   get_role_info as reqGet_role_info
-} from "../../service/role";
+} from "../../../service/role";
 import { ElMessage } from 'element-plus'
 export default {
   name: 'KeepaddRole',
@@ -128,7 +128,7 @@ export default {
   },
   methods: {
     toRoleDetail (row) {
-      this.$router.push({ name: 'RoleDetail', query: { roleId: row.role_id } });
+      this.$router.push({ name: 'withdrawalRoleDetail', query: { roleId: row.role_id } });
     },
     goBack () {
       this.$router.go(-1)

src/pages/Withdrawal/Role/manage-role.vue

+<template>
+  <layout>
+    <role-list
+      appId="merchant-op-auditing"
+      detailPath="/op/withdrawal/roleRoleDetail"
+      rolePermissionId="role_management"
+    ></role-list>
+  </layout>
+</template>
+<script>
+import Layout from "../layout";
+import RoleList from "../../../components/Roles/RoleList";
+
+export default {
+  name: "KeepRoleManagement",
+  components: {
+    Layout,
+    RoleList,
+  },
+};
+</script>
+<style lang="less" scoped></style>

src/pages/Withdrawal/Role/role-detail.vue

+<template>
+  <role-detail appId="merchant-op-auditing"></role-detail>
+</template>
+<script>
+import RoleDetail from "../../../components/Roles/RoleDetail.vue";
+
+export default {
+  components: {
+    RoleDetail,
+  },
+};
+</script>

src/pages/User/userList/components/UserInfoEditModal.vue → src/pages/Withdrawal/User/userList/components/UserInfoEditModal.vue

@@ -63,7 +63,7 @@
 <script>
 import { ElMessage } from "element-plus";
 
-import { getRole_list as reqGetRoles } from '@/service/role';
+import { getRole_list as reqGetRoles } from '../../../../../service/role';
 
 export default {
   name: 'UserInfoEditModal',

src/pages/User/userList/components/UserInfoNewModal.vue → src/pages/Withdrawal/User/userList/components/UserInfoNewModal.vue

@@ -60,7 +60,7 @@
 <script>
 import { ElMessage } from "element-plus";
 
-import { getRole_list as reqGetRoles } from '@/service/role';
+import { getRole_list as reqGetRoles } from '../../../../../service/role';
 
 export default {
   name: 'UserInfoEditModal',

src/pages/Withdrawal/User/userList/index.vue

+<template>
+  <layout>
+    <user-list
+      appId="merchant-op-auditing"
+      userPermissionId="user_management"
+    ></user-list>
+  </layout>
+</template>
+
+<script>
+import UserList from "../../../../components/UserList";
+import Layout from "../../layout";
+
+export default {
+  components: {
+    Layout,
+    UserList,
+  },
+};
+</script>

src/pages/Withdrawal/components/PageHeader/User.vue

+<template>
+  <el-dropdown>
+    <div class="user-info">
+      <el-avatar
+        :src="userInfo.avatar || DEFAULT_AVATAR"
+        size="small"
+      ></el-avatar>
+      <span class="user-name">{{userInfo.name}}</span>
+    </div>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item>
+          <i class="el-icon-message"></i>
+          {{userInfo.email}}
+        </el-dropdown-item>
+        <el-dropdown-item>
+          <span><a
+              class="link"
+              href="//pandora.yidian-inc.com/"
+            >返回pandora工具平台</a></span>
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import { HEADER_CONFIG } from '@/config/pageconfig';
+
+export default {
+  computed: mapState({
+    userInfo: state => (state.userInfo || {}),
+  }),
+
+  data () {
+    return {
+      DEFAULT_AVATAR: HEADER_CONFIG.miscellaneous.defaultAvatar,
+    };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.user-info {
+  display: flex;
+  align-items: center;
+}
+
+.user-name {
+  margin-left: 12px;
+  color: #fff;
+}
+</style>

src/pages/Withdrawal/components/PageHeader/config.js

+const headerConfig = [
+  {
+    name: "提现审核",
+    path: "/op/withdrawal/examine"
+  },
+  {
+    path: "/op/withdrawal/roleManageRole",
+    name: "角色管理",
+    requireAuthentication: true,
+    requiredPermission: "role_management"
+  },
+  {
+    path: "/op/withdrawal/user",
+    name: "用户管理",
+    requireAuthentication: true,
+    requiredPermission: "user_management"
+  }
+];
+
+export default headerConfig;

src/pages/Withdrawal/components/PageHeader/index.vue

+<template>
+  <div id="pageheader">
+    <div class="line"></div>
+    <el-menu
+      class="header-menu"
+      mode="horizontal"
+      :router="true"
+      background-color="#545c64"
+      text-color="#fff"
+      :default-active="activeMenu"
+      active-text-color="#ffd04b"
+      unique-opened
+    >
+      <el-menu-item
+        v-for="item in visibleMenuItems"
+        :index="item.path"
+        :key="item.path"
+      >
+        {{ item.name }}
+      </el-menu-item>
+      <el-menu-item key="usermenu" class="user-menu">
+        <user></user>
+      </el-menu-item>
+    </el-menu>
+  </div>
+</template>
+
+<script>
+import headerConfig from "./config";
+import User from "./User.vue";
+
+export default {
+  name: "PageHeader",
+  components: {
+    User,
+  },
+  data() {
+    return {
+      headerConfig,
+    };
+  },
+  computed: {
+    activeMenu() {
+      return this.$route.path;
+    },
+    visibleMenuItems() {
+      const visibleMenuItems = this.headerConfig.filter((item) => {
+        if (!item.requireAuthentication) {
+          return true;
+        }
+        if (this.hasPermission(item.requiredPermission)) {
+          return true;
+        }
+        return false;
+      });
+      return visibleMenuItems;
+    },
+  },
+  beforeMount() {},
+  methods: {
+    hasPermission(permissionId) {
+      return (
+        this.$store.getters.moduleSubPermissions(
+          permissionId,
+          "merchant-op-auditing"
+        ).length !== 0
+      );
+    },
+  },
+};
+</script>
+
+<style lang="less"></style>

src/pages/Withdrawal/layout/index.less

+.layout {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.main {
+	flex: 1;
+}

src/pages/Withdrawal/layout/index.vue

+<template>
+  <div class="layout">
+    <!-- 页面公共 header -->
+    <page-header class="page-header"></page-header>
+
+    <!-- 页面主体部分 -->
+    <div class="main">
+      <slot></slot>
+    </div>
+
+  </div>
+</template>
+<script>
+import PageHeader from '../components/PageHeader';
+
+export default {
+  components: { PageHeader },
+};
+</script>
+
+<style lang="less" src="./index.less"></style>

src/router/Withdrawal/index.js

+// 提现审核
+const withdrawalRoutes = [
+  {
+    path: "/op/withdrawal",
+    redirect: "/op/withdrawal/examine"
+  },
+  {
+    path: "/op/withdrawal/examine",
+    name: "Examine",
+    component: () =>
+      import(/* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Examine")
+  },
+  //用户管理
+  {
+    path: "/op/withdrawal/user",
+    name: "User",
+    component: () =>
+      import(
+        /* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/User/userList"
+      )
+  },
+  //角色管理
+  {
+    path: "/op/withdrawal/roleAddRole",
+    name: "AddRole",
+    component: () =>
+      import(
+        /* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Role/add-role"
+      ),
+    meta: {
+      requireAuth: true,
+      keepAlive: true
+    }
+  },
+  {
+    path: "/op/withdrawal/roleManageRole",
+    name: "withdrawalManageRole",
+    component: () =>
+      import(
+        /* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Role/manage-role"
+      ),
+    meta: {
+      requireAuth: true,
+      keepAlive: true
+    }
+  },
+  {
+    path: "/op/withdrawal/roleRoleDetail",
+    name: "withdrawalRoleDetail",
+    component: () =>
+      import(
+        /* webpackChunkName: "Withdrawal" */ "@/pages/Withdrawal/Role/role-detail"
+      )
+  }
+];
+
+export default withdrawalRoutes;

src/router/index.js

@@ -4,12 +4,13 @@ import LifeNo from "../pages/Life-no/index.vue";
 import LifeNoDetail from "../pages/Life-no/life-no-detail.vue";
 
 import User from "../pages/User/userList";
-import UserDetail from "../pages/User/user-detail.vue";
+// import UserDetail from "../pages/User/user-detail.vue";
 
-import AddRole from "../pages/Role/add-role.vue";
+// import AddRole from "../pages/Role/add-role.vue";
 import ManageRole from "../pages/Role/manage-role.vue";
 import RoleDetail from "../pages/Role/role-detail.vue";
 import goodsRouter from "./Goods/index";
+import withdrawalRoutes from "./Withdrawal/index";
 import groupmealRouters from "./Groupmeal/index";
 const routes = [
   {
@@ -80,40 +81,23 @@ const routes = [
     name: "/op/User",
     component: User
   },
-  {
-    path: "/op/userDetail",
-    name: "UserDetail",
-    component: UserDetail
-  },
-  //角色管理
-  {
-    path: "/op/roleAddRole",
-    name: "AddRole",
-    component: AddRole,
-    meta: {
-      requireAuth: true,
-      keepAlive: true
-    }
-  },
   {
     path: "/op/roleManageRole",
     name: "ManageRole",
     component: ManageRole,
     meta: {
-      requireAuth: true,
-      keepAlive: true
+      requireAuth: true
     }
   },
   {
     path: "/op/roleRoleDetail",
     name: "RoleDetail",
-    component: RoleDetail,
-    meta: {
-      keepAlive: true
-    }
+    component: RoleDetail
   },
   // 商品管理路由
   ...goodsRouter,
+  // 钱包审核
+  ...withdrawalRoutes,
   // 团餐运营
   ...groupmealRouters
 ];

src/service/Withdrawal/common.js

+export const defaultParams = {
+    appid: "merchant-op-auditing"
+}

src/service/Withdrawal/withdrawal.js

+import axios from "@/utils/request";
+import { defaultParams } from "./common";
+
+const getParams = (p = {}) => {
+  return { ...defaultParams, ...p };
+};
+
+// 获取提现审核列表
+export async function getApplyList(params) {
+  const res = await axios.get("/api/v1/get_withdrawal_apply_list", {
+    params: getParams(params)
+  });
+  return res;
+}
+// 黑名单，冻结用户
+export async function getBlackList(params) {
+  const res = await axios.post(
+    "/api/v1/get_withdrawal_black_list",
+    getParams(params)
+  );
+  return res;
+}
+// 获取订单审核--通过，拒绝
+export async function getWithdrawAudit(params) {
+  const res = await axios.post("/api/v1/get_withdraw_audit", getParams(params));
+  return res;
+}
+// 获取提现失败冻结
+export async function getFreezingFund(params) {
+  const res = await axios.post("/api/v1/get_freezing_fund", getParams(params));
+  return res;
+}
+// 获取提现审核详情
+export async function getApplyDetail(params) {
+  const res = await axios.get("/api/v1/get_apply_detail", {
+    params: getParams(params)
+  });
+  return res;
+}
+//权限列表
+export async function getRolesForUser(user_email) {
+  const res = await axios.post(
+    "/api/v1/merchant/authority/get_role_list?appid=merchant-op-auditing",
+    {
+      user_email
+    }
+  );
+  return res.permissions;
+}

src/service/role.js

-import axios from '../utils/request';
+import axios from "../utils/request";
 // import qs from 'qs';
 //角色列表
-export async function getRole_list (parmasRole_list) {
-  const res = await axios.post("/api/v1/merchant/authority/role_list", parmasRole_list)
-  return res;
+export async function getRole_list(parmasRole_list, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/merchant/authority/role_list",
+    params: { appid },
+    data: parmasRole_list
+  };
+  // const res = await axios.post("/api/v1/merchant/authority/role_list", parmasRole_list)
+  // return res;
+  return await axios(opts);
 }
 //添加角色
-export async function getAdd_role (parmasAdd_role) {
-  const res = await axios.post("/api/v1/merchant/authority/add_role", parmasAdd_role)
-  return res;
+export async function getAdd_role(parmasAdd_role, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/merchant/authority/add_role",
+    params: { appid },
+    data: parmasAdd_role
+  };
+  return await axios(opts);
+  // const res = await axios.post("/api/v1/merchant/authority/add_role", parmasAdd_role)
+  // return res;
 }
 //角色编辑
-export async function getUpdate_role (parmasUpdate_role) {
-  const res = await axios.post("/api/v1/merchant/authority/update_role", parmasUpdate_role)
-  return res;
+export async function getUpdate_role(parmasUpdate_role, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/merchant/authority/update_role",
+    params: { appid },
+    data: parmasUpdate_role
+  };
+  return await axios(opts);
+  // const res = await axios.post("/api/v1/merchant/authority/update_role", parmasUpdate_role)
+  // return res;
 }
 //角色详情
-export async function get_role_info (role_id) {
-  const res = await axios.post("/api/v1/merchant/authority/get_role_info", {
-    role_id
-  })
-  return res.result;
+export async function get_role_info(role_id, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/merchant/authority/get_role_info",
+    params: { appid },
+    data: { role_id }
+  };
+  return await axios(opts);
+
+  // const res = await axios.post("/api/v1/merchant/authority/get_role_info", {
+  //   role_id
+  // })
+  // return res.result;
 }
 //角色删除
-export async function getDelete_role (role_id) {
-  const res = await axios.post("/api/v1/merchant/authority/delete_role", {
-    role_id
-  })
-  return res;
+export async function getDelete_role(role_id, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/merchant/authority/delete_role",
+    params: { appid },
+    data: { role_id }
+  };
+  return await axios(opts);
+
+  // const res = await axios.post("/api/v1/merchant/authority/delete_role", {
+  //   role_id
+  // })
+  // return res;
 }
 
 //权限列表
-export async function getAll_role_list (user_email) {
-  const res = await axios.post("/api/v1/merchant/authority/get_role_list", {
-    user_email
-  })
-  return res.permissions;
+export async function getAll_role_list(user_email, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/merchant/authority/get_role_list",
+    params: { appid },
+    data: { user_email }
+  };
+  return await axios(opts);
+  // const res = await axios.post("/api/v1/merchant/authority/get_role_list", {
+  //   user_email
+  // })
+  // return res.permissions;
 }

src/service/user.js

@@ -24,17 +24,32 @@ export async function getUserDetail (params) {
   return await axios.get("/api/v1/users/detail", { params });
 }
 
-export async function editUser (data) {
-  return await axios.post("/api/v1/users/edit", data);
+export async function editUser (data, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/users/edit",
+    params: { appid },
+    data: data
+  };
+  return await axios(opts);
+
+  // return await axios.post("/api/v1/users/edit", data);
 }
 
-export async function createUser (data) {
-  return await axios.post("/api/v1/users/new", data);
+export async function createUser (data, appid) {
+  const opts = {
+    method: "post",
+    url: "/api/v1/users/new",
+    params: { appid },
+    data: data
+  };
+  return await axios(opts);
+  // return await axios.post("/api/v1/users/new", data);
 }
 //用户详情
-export async function getUser_detail (user_id) {
-  const res = await axios.post(`/api/v1/merchant/authority/get_user_info`, {
-    user_id
-  })
-  return res.result;
-}
+// export async function getUser_detail (user_id) {
+//   const res = await axios.post(`/api/v1/merchant/authority/get_user_info`, {
+//     user_id
+//   })
+//   return res.result;
+// }

src/store/index.js

 import { createStore } from "vuex";
-import { getPermissions } from '@/service/user';
-import { PERMISSIONNAME_PAGEMODULE } from '../config/pageconfig'
+import { getPermissions } from "@/service/user";
+import { PERMISSIONNAME_PAGEMODULE } from "../config/pageconfig";
+import { getRolesForUser } from "@/service/Withdrawal/withdrawal";
 
 export default createStore({
   state: {
     permissions: null,
-    userInfo: null
-
+    userInfo: null,
+    permissionsForApp: {}
   },
   mutations: {
-    updateUserPermission (state, payload) {
+    updateUserPermission(state, payload) {
       state.permissions = payload;
     },
-    updateUserInfo (state, payload) {
+    updateUserInfo(state, payload) {
       state.userInfo = payload;
+    },
+    updatePermissionForApp(state, payload) {
+      const { appId, permissions } = payload;
+      state.permissionsForApp = state.permissionsForApp || {};
+      state.permissionsForApp[appId] = permissions;
     }
   },
   actions: {
-    async updateUserPermission ({ commit }, payload) {
+    async updateUserPermission({ commit }, payload) {
       const { permissions = [] } = await getPermissions(payload.email);
 
       console.log("VUEX action updateUserPermission::", permissions);
-      commit('updateUserPermission', permissions)
+      commit("updateUserPermission", permissions);
+    },
+    async fetchPermission({ commit }, { email, appId }) {
+      if (appId === "merchant-op-auditing") {
+        const permissions = await getRolesForUser(email);
+        if (!permissions) {
+          return;
+        }
+
+        const permissionMap = permissions.reduce((prev, permission) => {
+          prev[permission.name] = permission;
+          return prev;
+        }, {});
+
+        commit("updatePermissionForApp", { appId, permissions: permissionMap });
+        return;
+      }
+      console.error("无 appId 注册", appId);
     }
   },
   modules: {},
@@ -29,7 +52,9 @@ export default createStore({
     subPermissions: state => {
       const permissionCol = {};
       (state.permissions || []).forEach(element => {
-        PERMISSIONNAME_PAGEMODULE[element.name] && (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] = element.sub_permissions)
+        PERMISSIONNAME_PAGEMODULE[element.name] &&
+          (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] =
+            element.sub_permissions);
       });
       return permissionCol;
     },
@@ -38,10 +63,22 @@ export default createStore({
      * @param {*} module 模块名，可选值： enterprise, lifeNo, role, user
      * @returns
      */
-    moduleSubPermissions: (state) => (module) => {
+    moduleSubPermissions: state => (module, appId = "") => {
+      if (appId !== "") {
+        if (!state.permissionsForApp[appId]) {
+          return [];
+        }
+        if (!state.permissionsForApp[appId][module]) {
+          return [];
+        }
+        return state.permissionsForApp[appId][module].sub_permissions;
+      }
+
       const permissionCol = {};
       (state.permissions || []).forEach(element => {
-        PERMISSIONNAME_PAGEMODULE[element.name] && (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] = element.sub_permissions)
+        PERMISSIONNAME_PAGEMODULE[element.name] &&
+          (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] =
+            element.sub_permissions);
       });
       return permissionCol[module];
     }