add

41d51382 · chendeli · 96191de6 · 41d51382 · 41d51382 · 41d51382
--- a/src/components/business-new/yqy-adjust.vue
+++ b/src/components/business-new/yqy-adjust.vue
 <template>
  <div class="cource-teach" id="adjust-u">
-      <div :class="isFixed ? 'cource-header fixed' : 'cource-header'" :style="{paddingTop:ptop,height:menuHeight}">
-          <div  class="font-title" :style="{top:isFixed?ptop:'0'}">
+      <div :class="isFixed ? 'cource-header fixed' : 'cource-header'" :style="{height:menuHeight}">
+          <div  class="font-title" :style="{paddingTop:ptop}">
            {{title}}
            
          </div>
@@ -58,6 +58,7 @@ export default {
      isShowLoading:true,
      menuHeight:0,
      ptop:0,
+      popHeight:0
    }
  },
  props:{
@@ -79,10 +80,15 @@ export default {
      },
  },
  mounted(){
-    //alert(this.userToken+"自组建");
+ 
    this.list = this.parmData;
-    this.menuHeight = this.statusBarHeight + 7 + 40 + "px";
-    this.ptop = this.statusBarHeight + "px";
+    if(window.__isAndroid){
+      this.popHeight = this.statusBarHeight/2
+    }else{
+      this.popHeight = this.statusBarHeight
+    }
+    this.menuHeight = this.popHeight + 7 + 40 + "px";
+    this.ptop = this.popHeight + "px";
   // this.getData();
    
  },
@@ -172,7 +178,12 @@ export default {
        token:_this.userToken,
        type:status,
        courseId:id,
-        setEntry: 'headers'
+        setEntry: 'headers',
+        token:_this.userToken,
+        setEntry: 'headers',
+        data:{
+             token:_this.userToken,
+        }
      }
     /// alert(this.token)
      _this.POST('contents/favors',parm).then(function(res){
@@ -266,7 +277,7 @@ export default {
 
  .font-title{
    line-height: px2rem(40px);
-    height: px2rem(40px);
+    /*height: px2rem(40px);*/
    background: #fff;
  }
 }
@@ -295,6 +306,7 @@ export default {
  }
 }
 .fixed{
+  background: #fff;
  .font-title{
    position: fixed;
    top:0;

--- a/src/components/business-new/yqy-five-minutes.vue
+++ b/src/components/business-new/yqy-five-minutes.vue
 <template>
-    <div class="hot-teacher">
-        <div class="space-between">
+    <div class="hot-teacher" >
+        <div class="space-between" id="fiveBoxMenu">
            <img class="img" src="../../images/mins.png"/>
            <div @click="goToPage('')" class="five-more gray fs11">
                更多<img src="../../images/right-throw.png" class="thorw-icon"/>

--- a/src/components/business-new/yqy-home-adv.vue
+++ b/src/components/business-new/yqy-home-adv.vue
@@ -22,6 +22,7 @@

 <script>
 // import { setEventByModuleCode } from '@/utils/index'
+ import { jumpWebPageUrl } from '@/utils/index'
 export default {
    data(){
        return {
@@ -50,32 +51,20 @@ export default {

        //跳转
        goToPage(item,parm){
-            console.log(item);
+            //console.log(item);
            let _this = this;
-            let url = location.host+'/#/'
-
+            //let url = location.protocol+'//'+location.host+'/#/'
+            //alert(url);
            if(parm == 'list'){
                
                rocNative.gotoNewWebActivity({
-                    url: 'http://10.177.10.231:8000/#/teachers'
+                    url: jumpWebPageUrl+'teachers'
                })
-                // this.$router.push({
-                //     path: '/teachers',
-                //     query:{
-                //         userToken:_this.userToken
-                //     }
-                // })
+
            }else{
                rocNative.gotoNewWebActivity({
-                    url: 'http://10.177.10.231:8000/#/teachersDetail?id='+item.id+"&from=appHome"
+                    url: jumpWebPageUrl+'teachersDetail?id='+item.id+"&from=appHome"
                })
-                // this.$router.push({
-                //     path: '/teachersDetail',
-                //     query:{
-                //         id:item.id,
-                //         userToken:_this.userToken
-                //     }
-                // })
            }
            
            // let obj = {}

--- a/src/components/business-new/yqy-home-banner.vue
+++ b/src/components/business-new/yqy-home-banner.vue
@@ -14,7 +14,7 @@
 </template>

 <script>
-// import { setEventByModuleCode } from '@/utils/index'
+ import { jumpWebPageUrl } from '@/utils/index'
 export default {
  name: 'YqyHomeBanner',
   data(){
@@ -38,11 +38,22 @@ export default {
    goToPage(itemData){
      
      let paramList = this.setEventByModuleCode(itemData);
-      if(itemData.appModuleInfo && itemData.appModuleInfo.code != 'M400'){
+
+      if(itemData.appModuleInfo.code != 'M400'){
+        //alert(itemData.appModuleInfo.code);
        rocNative.dispatchEventByModuleCode({
            modeCode: itemData.appModuleInfo.code,
            jsonString: paramList
        })
+      }else{
+
+          rocNative.gotoNewWebActivity({
+              url: jumpWebPageUrl+'teachers'
+          })
+        // this.$router.push({
+        //     path: paramList[0].url,
+        //     query:paramList[0].query
+        // })
      }
      this.pageBurialPoin({
        menuLevel:1,

--- a/src/components/business-new/yqy-home-header.vue
+++ b/src/components/business-new/yqy-home-header.vue
 <template>
  <div :class="searchFix?'header fixed' : 'header' " id="search-top" :style="{height:menuptop}">
-    <div class="search-menu" :style="{paddingTop:ptop}">
+    <div class="search-menu" :style="{paddingTop:'20px'}">
      <!-- <div :class="isTransparent?'search-transparent':'bgWhite'" class="search">
        <input type="search" :class="isTransparent?'search-transparent':''" class="input" v-model="searchVal" :placeholder="placeholder" :disabled="disabled" />
        <img v-if="searchFix" class="search-img" src='../../images/search-grey.png'>
@@ -28,6 +28,7 @@ export default {
        isShowMsg:true,
        ptop:0,
        menuptop:0,
+        popHeight:0
    }
  },
  props:{
@@ -47,9 +48,14 @@ export default {

  mounted(){
    
+    if(window.__isAndroid){
+      this.popHeight = this.statusBarHeight/2
+    }else{
+      this.popHeight = this.statusBarHeight
+    }
    this.count =  this.msgCount;
-    this.ptop = this.statusBarHeight+7+'px';
-    this.menuptop = this.statusBarHeight+7+43+'px'
+    this.ptop = this.popHeight+7+'px';
+    this.menuptop = this.popHeight+7+'px'
   // console.log(this.statusBarHeight);
    if(this.msgCount == ''){
      this.isShowMsg = false

--- a/src/components/business-new/yqy-teacher-list.vue
+++ b/src/components/business-new/yqy-teacher-list.vue
 <template>
-  <div class="cource-teach" id="new-course">
-      <div class="space-between cource-header" >
-          <div  class="title" >{{title}}</div>
+  <div class="cource-teach" >
+      <div class="space-between cource-header">
+          <div  class="title" id="new-course">{{title}}</div>
      </div>
     
      <div class="couse-list">
@@ -112,10 +112,13 @@ export default {
      })
      let _this = this,
      parm = {
-        token:this.userToken,
+        token:_this.userToken,
        type:status,
        courseId:id,
-        setEntry: 'headers'
+        setEntry: 'headers',
+        data:{
+             token:_this.userToken,
+        }
      }
      _this.POST('contents/favors',parm).then(function(res){


--- a/src/components/teachers/teach-top.vue
+++ b/src/components/teachers/teach-top.vue
@@ -41,7 +41,7 @@ export default {
 
  methods: {
    backPre(){
-      alert("999");
+      ///alert("999");
      rocNative.goBack()
     // this.$router.back(-1);
    },

--- a/src/utils/fetch.js
+++ b/src/utils/fetch.js
@@ -14,7 +14,7 @@ service.interceptors.request.use(config => {
  // console.log('config: ', config, config.data.setEntry)
  if (config.data && config.data.setEntry) {
    config.headers['sysCode'] = config.data.sysCode || 10
-    if(config.token){
+    if(config.data.token){
       config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
    }
   

--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -230,6 +230,8 @@ export function jumpEvaluatPage(){
 }


+
+
 // dev地址
 // const baseUrl = 'https://dev-sc.yunqueyi.com/'
 // const apiUrl = 'https://dev-api.yunqueyi.com/'
@@ -240,6 +242,8 @@ const apiUrl = 'https://test1-api.yunqueyi.com/'

 const evaluatPageUrl = 'https://test1-phome.yunqueyi.com/gpr/#/home'

+export const jumpWebPageUrl =  'https://test1-sc.yunqueyi.com/appl/#/'
+
 //const devApiUri = 'https://test1-api.yunqueyi.com/'

 // // uat地址

--- a/src/utils/mixins.js
+++ b/src/utils/mixins.js
@@ -103,11 +103,12 @@ module.exports = {
                let path = paramList[0]['key'];
                let v = paramList[0]['value'];
                let query = this.setRouterParm(paramList);
-                //alert(this.token);
-                this.$router.push({
-                    path: v,
+                paramList = [{
+                    url:v,
                    query:query
-                })
+                }]
+                //alert(this.token);
+               
            }
            if(typeof paramList === 'string' && !paramList){
                paramList = []

--- a/src/views/home/home-new.vue
+++ b/src/views/home/home-new.vue
--- a/src/views/teachers/detail.vue
+++ b/src/views/teachers/detail.vue
@@ -29,7 +29,7 @@
                    <div class="item-line" v-for="(item,index) in newsList">
                        <div class="line-img" @click="goToPage(item)">
                            <img :src="item.imageUrl">
-                            <span class="tag">{{item.structureName}}</span>
+                            <span class="tag" v-if="item.structureName">{{item.structureName}}</span>
                            <span class="line-play" @click.stop="goToPage(item)">
                                <img src="../../images/grey-play.png">
                            </span>