Merge branch 'master' of http://123.60.98.226:3000/litiange/jundaosuzhou_wechatxcx

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.isTest131? true : false;
+            data.isTest = data.isTest140? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/search/list/index.wxml

@@ -71,6 +71,17 @@
       </view>
     </view>
   </view>
+  <!-- 活动 -->
+  <view class="product-item" wx:if="{{item.ext.type=='act_calendar'}}">
+    <image lazy-load class="product-img" src="{{item.ext.post_url}}" mode="aspectFill"></image>
+    <view class="product-info show-info">
+      <view class="product-title">{{item.ext.name}}</view>
+      <view class="show-info">  
+        <view>{{item.ext.begin_date}}-{{item.ext.end_date}}</view>
+        <view>{{item.ext.from_platform}}</view>
+      </view>
+    </view>
+  </view>
   <!-- 电影 -->
   <view class="product-item" wx:if="{{item.ext.type=='movie'}}">
     <image lazy-load class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></image>

project.private.config.json

@@ -10,8 +10,8 @@
           "name": "subPackages/foodListNew/index",
           "pathName": "subPackages/foodListNew/index",
           "query": "",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

utils/util.js

@@ -297,6 +297,12 @@ const gotoDetail = (item,isPagePoint,queryStr="") =>{
         url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr
       })
       break;
+	case "act_calendar":
+	  // 活动 
+	  wx.navigateTo({
+	    url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr
+	  })
+	  break;
     case "movie":
       // 产品 电影票
       let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title+queryStr