Merge branch 'master' into dev_master

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest103? true : false;
+            data.isTest = data.isTest104? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/index/index.js

@@ -991,6 +991,10 @@ Page({
 
 	onShow: function() {
         this.pagePoint({event: 'home_view'}, 1)
+        // 修复 首页广告点击后返回首页 tabbar不显示
+        if (this.data.showTime && !this.data.showFullAdv) {
+            wx.showTabBar()
+        }
 	},
 
 	/**

pages/index/index.wxml

@@ -299,7 +299,7 @@
     <view class="fullavd" wx:if="{{showFullAdv && startList.head_img}}" style="opacity: {{opacity}}">
         <view class="time" bindtap="closeFullAdv" wx:if="{{showTime && startList.media_type}}">{{time}}s跳过</view>
         <view class="Qtop" style="min-height:100vh" wx:if="{{showTime && startList.media_type}}">
-            <image src="{{startList.head_img}}"  style="width: 100%;height: 100vh;"></image>
+            <image src="{{startList.head_img}}"  style="width: 100%;height: 100vh;" bindtap="bannerClick" data-item="{{startList}}"></image>
         </view>
 
         <!-- 视频 -->