Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev
This commit is contained in:
		@@ -5,8 +5,10 @@
 | 
			
		||||
      <u-tabs :list="tabs" font-size="32" bg-color="#f3f5f7" inactive-color="#999999"
 | 
			
		||||
     :active-item-style="{color: '#222222'}" :is-scroll="true" :current="currIndex" @change="(i) => (currIndex = i)"> </u-tabs>
 | 
			
		||||
    </div>
 | 
			
		||||
    <OnlineClass ref="OnlineClass" :height="height" @toDetail="toDetail" v-show="currIndex == 0"></OnlineClass>
 | 
			
		||||
    <GeneralLawExam ref="GeneralLawExam" :height="height" @toTest="toTest" v-show="currIndex == 1"></GeneralLawExam>
 | 
			
		||||
    <div>
 | 
			
		||||
      <OnlineClass ref="OnlineClass" :height="height" @toDetail="toDetail" v-show="currIndex == 0"></OnlineClass>
 | 
			
		||||
      <GeneralLawExam ref="GeneralLawExam" :height="height" @toTest="toTest" v-show="currIndex == 1"></GeneralLawExam>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
<template>
 | 
			
		||||
  <div class="testForm">
 | 
			
		||||
    <u-navbar title="法治学习" :background="backgroundNavbar"></u-navbar>
 | 
			
		||||
    <div class="testForm_info" >
 | 
			
		||||
    <u-navbar title="法治学习" :background="backgroundNavbar" z-index="9999"></u-navbar>
 | 
			
		||||
    <div class="testForm_info">
 | 
			
		||||
      <div v-for="(item,index) in list" :key="index">
 | 
			
		||||
        <div v-if="activeIndex === index">
 | 
			
		||||
          <div class="type">
 | 
			
		||||
@@ -53,8 +53,9 @@ export default {
 | 
			
		||||
  data() {
 | 
			
		||||
    return {
 | 
			
		||||
      backgroundNavbar: {
 | 
			
		||||
        background: "url('https://cdn.cunwuyun.cn/qujing/navbar.png') no-repeat",
 | 
			
		||||
        backgroundSize: '100% 100%',
 | 
			
		||||
        background: '#FFF',
 | 
			
		||||
        // background: "url('https://cdn.cunwuyun.cn/qujing/navbar.png') no-repeat",
 | 
			
		||||
        // backgroundSize: '100% 100%',
 | 
			
		||||
      },
 | 
			
		||||
      list: [],
 | 
			
		||||
      activeIndex: 0, // 当前第几题
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user