Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

src/project/qujing/AppLegalLearning/AppLegalLearning.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="AppLegalLearning">
+    <u-navbar title="法治学习" background="#f3f5f7" :is-back="false" title-bold></u-navbar>
     <div class="tabs_box">
       <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>
@@ -15,6 +16,7 @@ import GeneralLawExam from './components/GeneralLawExam.vue'
 export default {
   name: 'AppLegalLearning',
   appName: '法治学习',
+  customNavigation: true,
   data() {
     return {
       currIndex: 0,

src/project/qujing/AppLegalLearning/classDetail.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="classDetail">
+    <u-navbar title="在线课堂" background="#f3f5f7"></u-navbar>
+
     <div class="media">
       <img src="https://cdn.cunwuyun.cn/qujing/jige.png" alt="" v-if="data.courseType == 0">
       <video :src="data.videoUrl" controls v-if="data.courseType == 1"/>
@@ -65,6 +67,7 @@
 
 <script>
 export default {
+  customNavigation: true,
   data() {
     return {
       showComment: false,