Bladeren bron

4.24版本

小太阳 6 jaren geleden
bovenliggende
commit
85d6dd150d

+ 9 - 1
app.wxss

@@ -18,7 +18,7 @@ html, body, page {
   box-sizing: border-box;
   min-height: 100%;
   flex: 1;
-  padding: 0 44rpx; /* 其实是用了order-container的样式, 可能有必要全部配置, 所以使用这个样式 *//* background: #eee; */
+  padding: 20rpx 44rpx 72rpx 44rpx; /* 其实是用了order-container的样式, 可能有必要全部配置, 所以使用这个样式 *//* background: #eee; */
 }
 
 .yuezhan-navigator{
@@ -32,6 +32,7 @@ html, body, page {
   margin-bottom: 74rpx;
 }
 
+
 .fdkz-card-img {
   height: 360rpx;
   border-radius: 15rpx;
@@ -412,4 +413,11 @@ html, body, page {
 
 component-search{
   width: 100%;
+}
+
+.componentList .wrapper{
+  margin-bottom: 72rpx;
+}
+.componentList > component-list:last-child .wrapper{
+  margin-bottom: 0;
 }

+ 1 - 1
common/components/component-list/component-list.js

@@ -60,7 +60,7 @@ Component({
         })
       }else{
         wx.navigateTo({
-          url: `../../zl_detail/index?id=${this.data.sceneId}`,
+          url: `/pages/zl_detail/index?id=${this.data.sceneId}`,
           success: function (res) { },
           fail: function (res) { },
           complete: function (res) { },

+ 5 - 1
common/components/component-list/component-list.wxss

@@ -16,7 +16,7 @@
 }
 
 .weui-media-box__hd_in-appmsg {
-  width: 240rpx;
+  width: 240rpx; 
   height: 180rpx;
   min-width: 240rpx;
   border-radius: 8rpx;
@@ -26,6 +26,7 @@
 
 .weui-tab__content_item {
   height: 100%;
+  background: #fff;
 }
 
 .weui-media-box__thumb {
@@ -92,3 +93,6 @@
   color: #646464;
 }
 
+.fdkk-cells{
+  background: #fff;
+}

+ 2 - 1
common/components/component-search/component-search.wxss

@@ -2,7 +2,8 @@
 .wrapper{
   padding: 30rpx 44rpx;
   position: relative;
-  height: calc(100% - 60rpx)
+  height: calc(100% - 60rpx);
+  background: #fff;
 }
 .search-wrapper{
   display: flex;

+ 7 - 0
pages/cg_detail/index.js

@@ -133,6 +133,13 @@ Page({
       let { description, relatedActivities, openTime } = pavilionDetail;
 
       let lessRelatedActivities = [];
+      
+      relatedActivities.forEach((currentValue) => {
+        if (currentValue.product) {
+          currentValue.product.link = escape(currentValue.product.link);
+          currentValue.product.imageUrl = escape(currentValue.product.imageUrl);
+        }
+      })
       this.setData({
         pavilionDetail,
         relatedActivitiesLength: pavilionDetail.relatedActivities.length,

+ 1 - 1
pages/cg_detail/index.wxml

@@ -71,7 +71,7 @@
         </view>
       </view>
       <view class='artist_avatar'>
-        <navigator hover-class='none' url="{{item.hasProduct&&!item.hasPay?('../yuezhan/pay_page/index?id='+item.id):(item.hasProduct?'../wv_page/index?id='+item.id:'../zl_detail/index?id='+item.id)}}" wx:if="{{!(index>2)||readActive}}" class='fdkz-card' wx:for="{{pavilionDetail.relatedActivities}}" wx:key="index">
+        <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl):('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:if="{{!(index>2)||readActive}}" class='fdkz-card' wx:for="{{relatedActivities}}" wx:key="index">
           <!-- <navigator url="{{item.hasProduct&&!item.hasPay?('../yuezhan/pay_page/index?id='+item.id):(item.hasProduct?'../wv_page/index?id='+item.id:'../zl_detail/index?id='+item.id)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'> -->
           <view class='fdkz-card-img'>
             <view class="fdkz-card-tag {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag_finish':'fdkz-card-tag_coming'}}">

+ 1 - 0
pages/swkz/index.js

@@ -125,6 +125,7 @@ Page({
       let { openTime } = exhibitionList;
       exhibitionList.forEach((currentValue) => {
         currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
+        currentValue.product ? currentValue.product.imageUrl = escape(currentValue.product.imageUrl) : '';
       })
       console.log(res)
       this.setData({

+ 2 - 2
pages/swkz/index.wxml

@@ -1,8 +1,8 @@
 <!--index.wxml-->
 <view class='container'>
- <navigator hover-class='none' url="{{item.hasProduct ?('../wv_page/index?link='+item.product.link+'&id='+item.id) : ('../zl_detail/index?id='+item.id)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
+ <navigator hover-class='none' url="{{item.hasProduct ?('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl) : ('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
     <view class='fdkz-card-img'>
-      <view class="new-fdkz-card-tag {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag_finish':'fdkz-card-tag_coming'}}">
+      <view class="new-fdkz-card-tag ">
         <text class='fdkz-card-tag-txt'>线上看展</text>
       </view>
       <image src="{{ imgServer + item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>

+ 33 - 1
pages/tongcheng/index.js

@@ -89,7 +89,8 @@ Page({
       noExhibitionImg,
       defaultImg,
       imgServer
-    })
+    });
+    console.log(this.data)
   },
   onShareAppMessage: function () {
 
@@ -266,6 +267,32 @@ Page({
     })
   },
 
+  offlineRecommend: function () {
+    wx.getLocation({
+      type: 'wgs84',
+      success: (res) => {
+        this.setData({
+          latitude: res.latitude,
+          longitude: res.longitude
+        })
+      }
+    })
+    let { latitude: lat, longitude: lng } = this.data;
+    request["offlineRecommend"]({
+      lat,
+      lng,
+    }, "", res => {
+      this.setData({
+        ExhibitionPopular: res.data.data
+      })
+      console.log(this.data.ExhibitionPopular)
+    }, err => {
+
+    }, complete => {
+
+    })
+  },
+
   getList: function (page) {
     let { locationNameDesp, locationName, latitude, longitude, activeDist, activeType } = this.data;
     let loginSessionKey = wx.getStorageSync("token");
@@ -308,9 +335,14 @@ Page({
         exhiNum: totalElements
       });
       console.log(this.data.exhibitionList)
+      console.log(res.data.data)
       wx.stopPullDownRefresh();
       // WxParse.wxParseTemArray("replyTemArray", 'reply', replyArr.length, that)
 
+      if (this.data.exhiNum <= 3){
+        this.offlineRecommend();
+      }
+
     }, err => {
 
     }, complete => {

+ 2 - 1
pages/tongcheng/index.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "component-search": "/common/components/component-search/component-search",
-    "drop-down": "/common/components/drop-down/index"
+    "drop-down": "/common/components/drop-down/index",
+    "component-list": "../../../common/components/component-list/component-list"
   }
 } 

+ 52 - 18
pages/tongcheng/index.wxml

@@ -1,4 +1,5 @@
 <!--index.wxml-->
+<view class='wrapper'>
 <drop-down navItems="{{navItem}}" activeType="{{activeType}}" activeDist="{{activeDist}}" exhiNum="{{exhiNum}}" class="drop-con" bind:closeMask="onIsclose" bind:activeItem="getActiveItem" style="height:{{isShow?'100%':'0'}}"></drop-down>
 <view class='container'>
   <view class='nav-con'>
@@ -21,28 +22,32 @@
       </view>
     </view>
   </view>
-  <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id):('../zl_detail/index?id='+item.id)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
-    <view class='fdkz-card-img'>
-      <view wx:if="{{item.statusText}}" class="fdkz-card-tag {{item.statusText == '即将开始' ? 'fdkz-card-tag-start' : ''}} {{item.statusText == '已结束' ? 'fdkz-card-tag-end' : ''}}">
-        <text class='fdkz-card-tag-txt'>{{item.statusText}}</text>
-      </view>
-      <image src="{{imgServer+item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
-    </view>
-    <view class='fdkz-card-info'>
-      <view class='fdkz-card-info-title'>
-        <view class='title-txt'>
-          {{item.name}}
+
+  <view class='fdkz-card-warpper'>
+    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl):('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
+      <view class='fdkz-card-img'>
+        <view wx:if="{{item.statusText}}" class="fdkz-card-tag {{item.statusText == '即将开始' ? 'fdkz-card-tag-start' : ''}} {{item.statusText == '已结束' ? 'fdkz-card-tag-end' : ''}}">
+          <text class='fdkz-card-tag-txt'>{{item.statusText}}</text>
         </view>
+        <image src="{{imgServer+item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
       </view>
-      <view class='fdkz-card-info-date'>
-        <view class='date-txt'>{{item.pavilionName}}</view>
-        <view class='changguan_title'>
-          <text class='iconfont iconweizhi'> {{item.distance||0}} km</text>
+      <view class='fdkz-card-info'>
+        <view class='fdkz-card-info-title'>
+          <view class='title-txt'>
+            {{item.name}}
+          </view>
         </view>
+        <view class='fdkz-card-info-date'>
+          <view class='date-txt'>{{item.pavilionName}}</view>
+          <view class='changguan_title'>
+            <text class='iconfont iconweizhi'> {{item.distance||0}} km</text>
+          </view>
+        </view>
+        <text></text>
       </view>
-      <text></text>
-    </view>
-  </navigator>
+    </navigator>
+  </view>
+
   <view class="weui-loadmore" wx:if="{{loading}}">
     <view class="weui-loading"></view>
     <view class="weui-loadmore__tips">正在加载</view>
@@ -66,4 +71,33 @@
     </view>
     <button type="warn" open-type='openSetting' bindopensetting="closeDialog">确定</button>
   </view>
+</view>
+
+  <view class='hot-search-con' wx:if="{{exhiNum <= 3 }}">
+    <view class='hot-search'>
+      <view class='hot-search-title'>
+        <text class='hot-search-title-txt'>热门推荐</text>
+      </view>
+      <!-- <view class='hot-tag'>
+        <text wx:for="{{keyword}}" wx:key="index" bindtap='keywordSearch' data-keyword='{{item.dataValue}}' class='hot-tag-item'>{{item.dataValue}}</text>
+      </view> -->
+      <view class='componentList'>
+        <block wx:for="{{ExhibitionPopular}}" wx:key="index">
+            <component-list
+              hasProduct="{{item.hasProduct}}"
+              hasPay="{{item.hasPay}}"
+              sceneId="{{item.id}}"
+              imageUrl="{{item.imageUrl}}"
+              name="{{item.name}}"
+              pavilionName="{{item.pavilionName}}"
+              statusTextDesp="{{item.statusTextDesp}}"
+              distance="{{item.distance}}"
+              online="{{item.online}}"
+              scenePv="{{item.pv}}"
+              link="{{item.product.showLink}}"
+            ></component-list>
+          </block>
+      </view>
+    </view>
+  </view>
 </view>

+ 25 - 0
pages/tongcheng/index.wxss

@@ -1,5 +1,8 @@
 /* pages/yuezhan/index.wxss */
 
+.wrapper{
+  background: #F5F5F5;
+}
 .container {
   margin-top: 210rpx;
 }
@@ -125,3 +128,25 @@
   height: 100%;
   transition: all ease 0.3s;
 }
+
+.hot-search-con{
+  margin-top: 40rpx;
+}
+
+.hot-search {
+  padding: 40rpx 44rpx 72rpx 44rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  background: #fff;
+}
+
+.hot-search-title{
+  margin-bottom: 60rpx;
+}
+.hot-search-title-txt {
+  font-size: 36rpx;
+}
+.fdkz-card-warpper .fdkz-card:last-child{
+  margin-bottom:0;
+}
+

+ 1 - 2
pages/tongcheng/search/index.js

@@ -32,8 +32,7 @@ Page({
     console.log(app.globalData.city);
     this.setData({
       cityAction: app.globalData.city
-    });
-    console.log(this.data)
+    })
   },
 
   tabClick: function (e) {

+ 18 - 15
pages/user/my_follow/index.wxml

@@ -36,21 +36,24 @@
               <text></text>
             </view>
           </navigator> -->
-          <block wx:for="{{myCollected}}" wx:key="index">
-            <component-list
-              hasProduct="{{item.hasProduct}}"
-              hasPay="{{item.hasPay}}"
-              sceneId="{{item.id}}"
-              imageUrl="{{item.imageUrl}}"
-              name="{{item.name}}"
-              pavilionName="{{item.pavilionName}}"
-              statusTextDesp="{{item.statusTextDesp}}"
-              distance="{{item.distance}}"
-              online="{{item.online}}"
-              scenePv="{{item.pv}}"
-              link="{{item.product.showLink}}"
-            ></component-list>
-          </block>
+          <view class='componentList'>
+            <block wx:for="{{myCollected}}" wx:key="index">
+              <component-list
+                hasProduct="{{item.hasProduct}}"
+                hasPay="{{item.hasPay}}"
+                sceneId="{{item.id}}"
+                imageUrl="{{item.imageUrl}}"
+                name="{{item.name}}"
+                pavilionName="{{item.pavilionName}}"
+                statusTextDesp="{{item.statusTextDesp}}"
+                distance="{{item.distance}}"
+                online="{{item.online}}"
+                scenePv="{{item.pv}}"
+                link="{{item.product.showLink}}"
+              ></component-list>
+            </block>
+          </view>
+          
         </view>
       </view>
     </view>

+ 3 - 11
pages/user/my_follow/index.wxss

@@ -1,7 +1,6 @@
 /* pages/user/my_saw/index.wxss */
 .container{
-  padding: 0;
-  margin-bottom: 80rpx;
+  padding: 60rpx 44rpx 72rpx 44rpx;
 }
 
 .weui-tab__panel {
@@ -54,15 +53,8 @@
   font-size: 22rpx;
   color: #999;
 }
-.fdkk-cells{
-  background: #fff;
-  margin-bottom: 20rpx;
-  padding: 20rpx;
-}
-.weui-tab__content_item{
-  padding:0 30rpx;
-  background: #fff;
-}
+
+
 .weui-tab__content_item:last-child > .fdkk-cells{
   margin-bottom: 0;
 }

+ 17 - 15
pages/user/my_saw/index.wxml

@@ -35,21 +35,23 @@
       <text></text>
     </view>
   </navigator> -->
-        <block wx:for="{{myBrowsed}}" wx:key="index">
-          <component-list
-            hasProduct="{{item.hasProduct}}"
-            hasPay="{{item.hasPay}}"
-            sceneId="{{item.id}}"
-            imageUrl="{{item.imageUrl}}"
-            name="{{item.name}}"
-            pavilionName="{{item.pavilionName}}"
-            statusTextDesp="{{item.statusTextDesp}}"
-            distance="{{item.distance}}"
-            online="{{item.online}}"
-            scenePv="{{item.pv}}"
-            link="{{item.product.showLink}}"
-          ></component-list>
-        </block>
+        <view class='componentList'>
+          <block wx:for="{{myBrowsed}}" wx:key="index">
+            <component-list
+              hasProduct="{{item.hasProduct}}"
+              hasPay="{{item.hasPay}}"
+              sceneId="{{item.id}}"
+              imageUrl="{{item.imageUrl}}"
+              name="{{item.name}}"
+              pavilionName="{{item.pavilionName}}"
+              statusTextDesp="{{item.statusTextDesp}}"
+              distance="{{item.distance}}"
+              online="{{item.online}}"
+              scenePv="{{item.pv}}"
+              link="{{item.product.showLink}}"
+            ></component-list>
+          </block>
+        </view>
         
         <view class='noCollection' wx:if="{{myBrowsed.length < 1}}" >
           <image src='{{noCollectionImg}}'></image>

+ 2 - 7
pages/user/my_saw/index.wxss

@@ -1,7 +1,6 @@
 /* pages/user/my_saw/index.wxss */
 .container{
-  padding: 0;
-  margin-bottom: 80rpx;
+  padding: 60rpx 44rpx 72rpx 44rpx;
 }
 
 
@@ -58,12 +57,8 @@
 .fdkk-cells{
   background: #fff;
   margin-bottom: 20rpx;
-  padding: 20rpx;
-}
-.weui-tab__content_item{
-  padding:0 30rpx;
-  background: #fff;
 }
+
 .weui-tab__content_item:last-child > .fdkk-cells{
   margin-bottom: 0;
 }

+ 22 - 18
pages/wv_page/index.js

@@ -5,29 +5,31 @@ const { serverName } = require('../../utils/services');
 const app = getApp();
 
 Page({
-
+  
   /**
    * 页面的初始数据
    */
   data: {
-  
+    forwardImg:'https://4dscene.4dage.com/cgaii/images/join/forwardImg.jpg'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    let dom = wx.createSelectorQuery().select('#wv')
+    console.log('asdasdasd', dom)
+    
     recordAccess(options)
     console.log(options)
-    let url = ''
-    let { currentUrl } = app.globalData;
-    console.log(currentUrl)
-    if (currentUrl.indexOf("https") != -1 ){
-      url = app.globalData.currentUrl;
-    }else{
-      url = unescape(options.link);
-    }
-    console.log('url', url)
+    let { link: url, imageUrl,id:sceneId } = options;
+    this.setData({
+      url: unescape(options.link),
+      imageUrl,
+      sceneId
+    })
+
+
     // console.log('isShare', isShare)
     
     // console.log('url', encodeParam(url))
@@ -36,17 +38,19 @@ Page({
     
     // let url = wx.getStorageSync('url')
     //记录
+  },
 
+  forward: function(url){
     this.setData({
-      url: url
+      url: url.detail.data.pop()
     })
   },
-
+  
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-  
+    
   },
 
   /**
@@ -88,11 +92,11 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-    let url = app.globalData.currentUrl;
-    let img = app.globalData.currentShareImg;
+    let { url, id, imageUrl, forwardImg} = this.data;
+    console.log(imageUrl || forwardImg)
     return {
-      path: `/pages/wv_page/index?isShare=1&url=${encodeParam(url)}`,
-      imageUrl: `${serverName}${img}`||''
+      path: `/pages/wv_page/index?isShare=1&link=${escape(url)}&id=${id}`,
+      imageUrl: imageUrl || forwardImg
     }
   }
 })

+ 1 - 1
pages/wv_page/index.wxml

@@ -1,2 +1,2 @@
 <!--pages/wv_page/index.wxml-->
-<web-view src="{{url}}"></web-view>
+<web-view id='wv' src="{{url}}" bindmessage='forward' ></web-view>

+ 10 - 5
pages/yuezhan/index.js

@@ -138,7 +138,10 @@ Page({
       console.log(res)
       exhibitionList.forEach((currentValue) => {
         currentValue.distance = Math.ceil(currentValue.distance);
-        currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
+        if (currentValue.product){
+          currentValue.product.link = escape(currentValue.product.link);
+          currentValue.product.imageUrl = escape(currentValue.product.imageUrl);
+        }
       })
       this.setData({
         currentPage: res.data.data.number + 1,
@@ -303,13 +306,15 @@ Page({
       hasproduct,
       haspay,
       productlink,
-      id
+      id,
+      imageurl
     } = e.currentTarget.dataset;
     console.log(e.currentTarget.dataset)
+    console.log(imageurl)
 
 
-    app.globalData.currentUrl = url
-    console.log('dwdwdw', app.globalData.currentUrl)
+    // app.globalData.currentUrl = url
+    // console.log('dwdwdw', app.globalData.currentUrl)
 
     // console.log('dwdwdwd',wx.getStorageSync('url'))
 
@@ -335,7 +340,7 @@ Page({
           case 1:
             if (hasproduct) {
               wx.navigateTo({
-                url: `../wv_page/index?link=${escape(productlink)}&id=${id}`,
+                url: `../wv_page/index?link=${escape(productlink)}&id=${id}&imageUrl=${imageurl}`,
                 success: function(res) {},
                 fail: function(res) {},
                 complete: function(res) {},

+ 7 - 5
pages/yuezhan/index.wxml

@@ -14,19 +14,21 @@
       </view>
     </view>
   </view>
-  <swiper wx:if="{{tag==0&&commodityImgs.length>0}}" class='swiper-style' circular="true" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
-    <swiper-item  wx:for="{{commodityImgs}}" bindtap='to_pay' data-pageType="{{item.pageType}}" data-urlType="{{item.urlType}}" data-hasProduct="{{item.hasProduct}}" data-hasPay="{{item.hasPay}}" data-url="{{item.url}}" data-id="{{item.id}}" wx:key="{{item.id}}"   data-productLink="{{item.productLink}}" >
+  <swiper wx:if="{{commodityImgs.length>0}}" class='swiper-style' circular="true" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
+    <swiper-item  wx:for="{{commodityImgs}}" bindtap='to_pay' data-pageType="{{item.pageType}}" data-urlType="{{item.urlType}}" data-hasProduct="{{item.hasProduct}}" data-hasPay="{{item.hasPay}}" data-imageUrl="{{item.imageUrl}}" data-url="{{item.url}}" data-id="{{item.id}}" wx:key="{{item.id}}"   data-productLink="{{item.productLink}}" >
       <image mode="aspectFill" src="{{imgServer+item.imageUrl||defaultImg}}" class="yuezhan-img" />
     </swiper-item>
   </swiper>
   <view class='yuezhan-navigator'>
     <view class='navigator-title'>推荐展览</view>
-    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id):('../zl_detail/index?id='+item.id)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card' >
+    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl):('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'  >
       <view class='fdkz-card-img'>
+
         <view wx:if="{{item.statusText}}" 
-        class="fdkz-card-tag {{item.statusText == '即将开始' ? 'fdkz-card-tag-start' : ''}} {{item.statusText == '已结束' ? 'fdkz-card-tag-end' : ''}}">
-          <text class='fdkz-card-tag-txt'>{{item.statusText}}</text>
+        class="{{item.online == 1 ? 'new-fdkz-card-tag' : 'fdkz-card-tag'}}  {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag-end':'fdkz-card-tag_coming'}}">
+          <text class='fdkz-card-tag-txt'>{{item.online == 1 ? '线上看展' : item.statusText}}</text>
         </view>
+
         <image src="{{imgServer+item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
       </view>
       <view class='fdkz-card-info'>

+ 5 - 0
pages/yuezhan/index.wxss

@@ -28,6 +28,11 @@
 .yuezhan-navigator{
   background: #fff;
   padding: 0 44rpx;
+  padding-bottom: 72rpx;
+}
+
+.yuezhan-navigator .fdkz-card:last-child{
+  margin-bottom:0rpx;
 }
 
 

+ 2 - 2
pages/yuezhan/search_result/index.wxml

@@ -54,7 +54,7 @@
                   </view>
                   
                   <view class='desc'>
-                    <view class="weui-media-box__desc">{{item.statusTextDesp}}</view>
+                    <view class="weui-media-box__desc">{{item.online == 1 ? '线上看展' :  item.statusTextDesp}}</view>
                     <view>
                       <view class="iconfont {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>
                       <text>{{item.hasProduct?item.pv:(item.distance || 0 +' km')}}</text>
@@ -149,7 +149,7 @@
                       </view>
                       
                       <view class='desc'>
-                        <view class="weui-media-box__desc">{{item.statusTextDesp}}</view>
+                        <view class="weui-media-box__desc">{{item.online == 1 ? '线上看展' :  item.statusTextDesp}}</view>
                         <view>
                           <view class="iconfont {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>
                           <text>{{item.hasProduct?item.pv:(item.distance || 0 +' km')}}</text>

+ 9 - 2
project.config.json

@@ -32,7 +32,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 12,
 			"list": [
 				{
 					"id": 0,
@@ -113,7 +113,14 @@
 					"id": 11,
 					"name": "博物馆信息",
 					"pathName": "pages/cg_detail/index",
-					"query": "id=14137",
+					"query": "id=14122",
+					"scene": null
+				},
+				{
+					"id": 12,
+					"name": "大场景",
+					"pathName": "pages/wv_page/index",
+					"query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
 					"scene": null
 				}
 			]

+ 5 - 2
utils/services.js

@@ -65,8 +65,11 @@ const urls = {
   //未读
   longPolling: '/wx/api/user/longPolling',
 
-  //热门推荐
-  recommend: '/wx/api/exhibition/recommend'
+  //搜索的热门推荐
+  recommend: '/wx/api/exhibition/recommend',
+
+  //线下展讯热门推荐
+  offlineRecommend: '/wx/api/exhibition/offlineRecommend'
 };
 // 上传路径
 const uploadUrls = {};