sunlupeng 1 年之前
父節點
當前提交
b2280819ba

+ 2 - 2
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://192.168.100.208:8080/admin/storage/create';//测试地址
 

+ 3 - 3
src/permission.js

@@ -4,7 +4,7 @@ import { getToken, setToken } from '@/utils/auth' // getToken from cookie
 import { lockStatus,unlock } from "@/api/allApi";
 //路由跳转之前
 router.beforeEach((to, _from, next) => {
-  // setToken('3ea044ab331806ba7b38202175e1cf31');
+  // setToken('aad99e8f2a2997d2bdc2a9ac6c87ec8d');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 
@@ -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';//测试地址
 

+ 7 - 6
src/utils/request.js

@@ -2,13 +2,14 @@ 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';//测试地址
+let devBaseURL = 'https://xiaoyou.dgtis.com/admin';//测试地址
 
-let devBaseURL = 'http://192.168.100.208:9083/admin';//测试地址
 
-// let devBaseURL = 'http://47.103.79.143:9085/admin';//阿里云地址
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.NODE_ENV === 'production' ? prodBaseURL : devBaseURL,// api 的 base_url
@@ -40,9 +41,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'; //测试地址
 

+ 9 - 5
src/views/HomeView/AnswerGame/QiXiAnswerGame.vue

@@ -62,6 +62,7 @@
 </template>
 <script>
 import { homeData,questionList,submitAnswer } from "@/api/qixiFestival";
+import AES from "@/utils/AES.js";
 import SiderInfo from '@/components/SiderInfo.vue';
 import { mapGetters } from 'vuex';
 export default{
@@ -112,9 +113,13 @@ export default{
     },
     getQuestionList(){
         questionList({}).then(response=>{
-                console.log(response.data.data);
-                this.questions = response.data.data.questions;
-                this.roomId = response.data.data.roomId;
+                 //解密
+                let resData = JSON.parse(AES.decrypt(response.data.data));
+                console.log(resData);
+                this.questions = resData.questions;
+                this.roomId = resData.roomId;
+                this.timerCountdown();
+                this.isShowItem = true;
             })
     },
     getHomeData(){
@@ -187,8 +192,7 @@ export default{
     },
     clickAnswer(){
         this.getQuestionList();
-            this.isShowItem = true;
-            this.timerCountdown();
+           
         // if(this.top){
         //     this.$message({
         //         message: '今日已答题!',

+ 1 - 1
src/views/HomeView/FestiveEvents.vue

@@ -105,7 +105,7 @@ export default {
                 });
             }
             //七夕节答题
-            if(val.actId==14){
+            if(val.actId==20){
                 this.$router.push({
                     path: '/home/festiveEvents/qiXiGame',
                     query: {

+ 1 - 0
src/views/HomeView/SignIn.vue

@@ -95,6 +95,7 @@ export default {
   },
   data() {
     return {
+      continuousSignCount:'',
       signDays:'',
       integral:'',
       markDate: [],