Merge branch 'origin/zcwy_0511' into dev0731

pages.json

@@ -78,8 +78,8 @@
 		{"path" : "pages/study/courseStudy","style" : {"navigationBarTitleText": "课程学习"}},
 		{"path" : "pages/study/audioTest","style" : {"navigationBarTitleText": "音频测试"}},
 		{"path" : "pages/study/videoTest","style" : {"navigationBarTitleText": "视频频测试"}},
-        {"path" : "pages/lecturer/certification/list","style" : {"navigationBarTitleText": "个人信息"}},
-        {"path" : "pages/lecturer/certification/info","style" : {"navigationBarTitleText": "个人信息"}}
+        {"path" : "pages/lecturer/certification/list","style" : {"navigationBarTitleText": "讲师信息"}},
+        {"path" : "pages/lecturer/certification/info","style" : {"navigationBarTitleText": "讲师信息"}}
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/lecturer/certification/info.vue

@@ -1,6 +1,10 @@
 <template>
   <view class="main">
     <u-toast ref="uToast"></u-toast>
+	<view class="back-icon"  @click="back()">
+		<u-icon style="position: absolute;" name="arrow-left"></u-icon>
+		<text class="back-icon-title">讲师信息</text>
+	</view>
     <u-modal :show="showFlag" :closeOnClickOverlay="true" :showCancelButton="true" @cancel="hideDialog" @confirm="submit" :content="scoreNum>80?'您给讲师打的分数是'+scoreNum+'分， 是否确认提交?':'您给讲师打的分数是'+scoreNum+'分， 低于认证通过的标准80分， 是否确认提交？'"></u-modal>
  <div class="info">
    <div class="info_top">
@@ -154,6 +158,9 @@
                     this.info(options.teacherId)
             },
             methods:{
+				   back(){
+						   uni.navigateBack();     
+				   },
                     showDialog(){
                             if(this.scoreNum<=0){
                                     this.$refs.uToast.show({message:"请先进行评份",type:'error'});
@@ -221,6 +228,18 @@
     }
 </script>
 <style scoped lang="scss">
+.back-icon{
+       background: #ffffff;
+       background-position: 0 0;
+       position: relative;
+       height: 40px;
+       display: flex;
+       align-items: center;
+}
+.back-icon-title{
+       flex: 1;
+       text-align: center;
+}
 .main {
   background: #F9F9F9;
   overflow:hidden ;

pages/lecturer/certification/list.vue

@@ -1,9 +1,9 @@
 <template>
        <view class="ranking-list-info">
 			<u-toast ref="uToast"></u-toast>
-			<view class="back-icon" @click="back()">
-				   <u-icon style="position: absolute;" name="arrow-left"></u-icon>
-				   <text class="back-icon-title">个人信息</text>
+			<view class="back-icon">
+				   <!-- <u-icon style="position: absolute;" name="arrow-left"></u-icon> -->
+				   <text class="back-icon-title">讲师信息</text>
 			</view>
 			<view class="ranking-list-box">
 				   <view class="main">
@@ -67,9 +67,6 @@
 						}
                },
                methods:{
-                       back(){
-                               uni.navigateBack();     
-                       },
                        gotoInfo(item){
                                uni.navigateTo({
                                        url:'/pages/lecturer/certification/info?reviewId='+this.reviewId+'&teacherId='+item.id