Browse Source

上线调整

sunlupeng 6 months ago
parent
commit
a5e6706e8d
4 changed files with 10 additions and 10 deletions
  1. 4 4
      config/prod.env.js
  2. 2 2
      src/permission.js
  3. 2 2
      src/views/giftManage/giftList.vue
  4. 2 2
      src/views/goodsManage/goodsList.vue

+ 4 - 4
config/prod.env.js

@@ -2,9 +2,9 @@ module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
 	// 阿里云环境
-  BASE_API: '"http://47.103.79.143:9085/admin"',
-  OS_API: '"http://47.103.79.143:9085/admin"'
+  // BASE_API: '"http://47.103.79.143:9085/admin"',
+  // OS_API: '"http://47.103.79.143:9085/admin"'
   //正式环境
-  // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
-  // OS_API: '"https://xiaoyou.dgtis.com/admin"'
+  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  OS_API: '"https://xiaoyou.dgtis.com/admin"'
 }

+ 2 - 2
src/permission.js

@@ -130,8 +130,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

+ 2 - 2
src/views/giftManage/giftList.vue

@@ -180,7 +180,7 @@
                 </el-form-item>
                 <el-form-item
                     style="width: 800px"
-                    label="商品说明"
+                    label="兑换说明"
                     prop="comment"
                     >
                 <tinymce v-model="dataForm.comment" ref="tinymce"></tinymce>
@@ -194,7 +194,7 @@
                 </el-form-item>
                 <el-form-item
                     style="width: 800px"
-                    label="品介绍"
+                    label="品介绍"
                     prop="skuDesc"
                     >
                 <skuDesc v-model="dataForm.skuDesc" ref="skuDesc"></skuDesc>

+ 2 - 2
src/views/goodsManage/goodsList.vue

@@ -180,7 +180,7 @@
                 </el-form-item>
                 <el-form-item
                     style="width: 800px"
-                    label="商品说明"
+                    label="兑换说明"
                     prop="comment"
                     >
                 <tinymce v-model="dataForm.comment" ref="tinymce"></tinymce>
@@ -194,7 +194,7 @@
                 </el-form-item>
                 <el-form-item
                     style="width: 800px"
-                    label="品介绍"
+                    label="品介绍"
                     prop="skuDesc"
                     >
                 <skuDesc v-model="dataForm.skuDesc" ref="skuDesc"></skuDesc>