sunny 1 ano atrás
pai
commit
3250c581d9
3 arquivos alterados com 7 adições e 6 exclusões
  1. 1 1
      src/main.js
  2. 2 2
      src/permission.js
  3. 4 3
      src/views/pointManage/pointRulesList.vue

+ 1 - 1
src/main.js

@@ -17,7 +17,7 @@ import './permission' // permission control
 Vue.use(Element, {
   size: 'medium' // set element-ui default size
 })
-const upLoadUrl = 'https://xiaoyou.dgtis.com/admin/storage/create';
+const upLoadUrl = 'http://47.103.79.143:9085/admin/storage/create';
 Vue.prototype.upLoadUrl = upLoadUrl;
 Vue.config.productionTip = false
 

+ 2 - 2
src/permission.js

@@ -62,8 +62,8 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => {
           store.dispatch('GetUserMenus').then(res => { // 拉取user_info
-            // const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
-            const roles = myRoles;
+            const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
+            // const roles = myRoles;
             store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
               router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record

+ 4 - 3
src/views/pointManage/pointRulesList.vue

@@ -4,7 +4,7 @@
     <!-- 查询和其他操作 -->
     <div class="filter-container">
       <el-select v-model="listQuery.type" clearable placeholder="积分规则类型" style="top: -4px;width: 200px;">
-        <el-option :key="item.type" v-for="item in allTypeList" :label="item.name" :value="item.type">
+        <el-option :key="item.dictValue" v-for="item in allTypeList" :label="item.dictLabel" :value="item.dictValue">
         </el-option>
       </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
@@ -96,7 +96,8 @@
 </style>
   
 <script>
-import { pointRulesTypeList, getPointRulesList, pointRulesCreateItem, pointRulesUpdateItem, pointRulesState } from "@/api/pointManage";
+import { getPointRulesList, pointRulesCreateItem, pointRulesUpdateItem, pointRulesState } from "@/api/pointManage";
+import { dataTypeList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -212,7 +213,7 @@ export default {
       });
     },
     getPointRulesType() {
-      pointRulesTypeList().then(response => {
+      dataTypeList({dictType:'integral_rule_type'}).then(response => {
         this.allTypeList = response.data.data;
       }).catch(() => {