Merge branch 'master' of http://git.dgtis.com/sunlupeng/pointsMall into pre

src/main.js

@@ -9,9 +9,9 @@ import './assets/css/global.css';
 import './assets/icon/iconfont.css';
 import './permission' // permission control
 
-// const prodUrl = 'https://xiaoyou.dgtis.com/admin/storage/create';//正式地址
+const prodUrl = 'https://xiaoyou.dgtis.com/admin/storage/create';//正式地址
 
-const prodUrl = 'http://47.103.79.143:9085/admin/storage/create';//阿里云地址
+// const prodUrl = 'http://47.103.79.143:9085/admin/storage/create';//阿里云地址
 
 const devUrl = 'http://47.103.79.143:9085/admin/storage/create';//测试地址
 

src/permission.js

@@ -33,9 +33,9 @@ router.beforeEach((to, _from, next) => {
       
     }else{
       
-      // const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
+      const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
 
-      const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
+      // const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
       
       const devHref = 'http://192.168.100.208:8080/oneportal/login';//测试地址
 

src/utils/request.js

@@ -2,9 +2,9 @@ import axios from 'axios'
 import { Message, MessageBox } from 'element-ui'
 import { getToken } from '@/utils/auth'
 
-// let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
+let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
 
-let prodBaseURL = 'http://47.103.79.143:9085/admin';//阿里云地址
+// let prodBaseURL = 'http://47.103.79.143:9085/admin';//阿里云地址
 
 let devBaseURL = 'http://192.168.100.208:9083/admin';//测试地址
 
@@ -40,9 +40,9 @@ service.interceptors.response.use(
           type: 'error'
         }).then(() => {
             
-            // const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
+            const prodHref = 'http://dgt.dgtis.com/oneportal/login';//正式地址
 
-            const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
+            // const prodHref = 'http://dgtcloud.dgtis.com/oneportal/login';//阿里云地址
           
             const devHref = 'http://192.168.100.208:8080/oneportal/login'; //测试地址
 

src/views/HomeView/EarnPoints.vue

@@ -196,7 +196,7 @@
             </el-pagination>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="积分获取规则" name="second">
+        <el-tab-pane label="证书积分规则" name="second">
           <el-empty v-if="!integralRules" :image-size="200"></el-empty>
           <div v-else v-html="integralRules"></div>
         </el-tab-pane>

vue.config.js

@@ -7,7 +7,7 @@ const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 const cdn = {
   js: [
     `https://cdn.bootcdn.net/ajax/libs/vue/2.6.14/vue.min.js`,
-    `https://cdn.bootcdn.net/ajax/libs/element-ui/2.15.12/index.min.js`,
+    // `https://cdn.bootcdn.net/ajax/libs/element-ui/2.15.14/index.min.js`,
     `https://cdn.bootcdn.net/ajax/libs/axios/0.17.1/axios.min.js`,
     `https://cdn.bootcdn.net/ajax/libs/vue-router/3.5.1/vue-router.min.js`,
   ]
@@ -27,7 +27,7 @@ module.exports = defineConfig({
       vue: 'Vue',
       'vue-router': 'VueRouter',
       axios: 'axios',
-      'element-ui': 'ELEMENT',
+      // 'element-ui': 'ELEMENT',
     },
     plugins: [
       new CompressionWebpackPlugin({