Merge branch 'dev-app-home-1029' into Branch_tag-app

# Conflicts:
#	src/utils/index.js

src/components/business-new/yqy-adjust.vue

@@ -90,6 +90,8 @@ export default {
   mounted(){
     
     this.list = this.parmData;
+    
+    this.$store.dispatch("setSource", []);
     //this.pageNo = this.adjustPageNo;
 
     // if(window.__isAndroid){

src/store/index.js

@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import common from './modules/common'
 import diagnosis from './modules/diagnosis'
 import gpRanking from './modules/gpRanking'
+import adjustDataList from './modules/adjustList'
 import getters from './getters'  
 
 Vue.use(Vuex)
@@ -11,7 +12,8 @@ const store = new Vuex.Store({
   modules: {
     common,
     diagnosis,
-    gpRanking
+    gpRanking,
+    adjustDataList
   },
   getters
 })

src/store/modules/adjustList.js

+const adjustList = {
+  state: {
+  	adjustLists:[]
+  },
+  mutations: {
+    SET_DATA: (state, adjustLists) => {
+    	console.log(state);
+      state.adjustLists = adjustLists
+    },
+  },
+  actions: {
+    setSource({ commit }, adjustLists) {
+      commit('SET_DATA', adjustLists)
+    },
+  }
+}
+
+export default adjustList

src/utils/index.js

@@ -233,10 +233,11 @@ export function jumpEvaluatPage(){
 
 
 // dev地址
-const baseUrl = 'https://dev-sc.yunqueyi.com/' 
-const apiUrl = 'https://dev-api.yunqueyi.com/'
+ const baseUrl = 'https://dev-sc.yunqueyi.com/' 
+ const apiUrl = 'https://dev-api.yunqueyi.com/'
 const evaluatPageUrl = 'https://dev-phome.yunqueyi.com/gpr/#/home'
 export const jumpWebPageUrl =  'https://dev-phome.yunqueyi.com/appl/#/'
+
 // test1地址
 // const baseUrl =  'https://test1-sc.yunqueyi.com/'
 // const apiUrl = 'https://test1-api.yunqueyi.com/'

src/views/home/home-new.vue

@@ -85,6 +85,7 @@
 import { Swipe, SwipeItem ,Header} from 'mint-ui';
 // import { setEventByModuleCode } from '@/utils/index'
 // import pullRefresh from '../../components/common/pullrefresh'
+import {mapState, mapMutations} from 'vuex'
 import BackTop from '../../components/common/backTop';
 import YqyTeacherList from '../../components/business-new/yqy-teacher-list';
 import YqyTopEvaluat from '../../components/business-new/yqy-home-learn-evaluation';
@@ -245,7 +246,7 @@ export default {
        //  _this.isShowKeep = true;
        //  _this.isHeightFromApp = true;
        //  _this.getKeepData(_this.token);
-       //_this.initByToken('593F679F62964076AF1C7489DA3343ED');
+       _this.initByToken('593F679F62964076AF1C7489DA3343ED');
          // _this.getIconData(_this.token);
        // _this.isIntStyle =  'font-style pull-down';
        //  _this.fiveTimePull();
@@ -281,6 +282,9 @@ export default {
     },
 
     methods:{
+        ...mapMutations([
+            'SET_DATA'
+        ]),
 
         goAppMsg(){
             
@@ -597,6 +601,7 @@ export default {
                 if(res.code === '000000'){
                     _this.adjustList = res.data || [];
                     _this.adjustPageNo = 1;
+                    _this.SET_DATA(_this.adjustList)
                     if(_this.adjustList.length>0){
                         
                         _this.userToken = userToken