commit in 4.22

app.js

@@ -5,7 +5,6 @@ const {
 
 App({
 
-
   onLaunch: function () {
     console.log('wx',wx)
     // 展示本地存储能力
@@ -142,4 +141,8 @@ App({
     currentUrl:'',
     currentShareImg:''
   }
-})
+})
+
+let app = getApp()
+export default app
+

app.json

@@ -53,7 +53,7 @@
       },
       {
         "pagePath": "pages/tongcheng/index",
-        "text": "线下看展",
+        "text": "线下展讯",
         "iconPath": "imgs/tongcheng.png",
         "selectedIconPath": "./imgs/tongcheng_active.png"
       },

app.wxss

@@ -33,7 +33,7 @@ html, body, page {
 }
 
 .fdkz-card-img {
-  height: 324rpx;
+  height: 360rpx;
   border-radius: 15rpx;
   overflow: hidden;
 }
@@ -58,18 +58,26 @@ html, body, page {
 }
 
 .fdkz-card-tag {
-  line-height: 40rpx;
+  line-height: 36rpx;
   position: absolute;
-  width: 92rpx;
   height: 36rpx;
   /* background: rgba(244, 47, 47, 0.65);  */
   background: #e02f2f;
   text-align: center;
-  top: 25rpx;
-  right: 20rpx;
+  top: 24rpx;
+  right: 24rpx;
   font-size: 20rpx;
   border-radius: 8rpx;
   font-weight: bold;
+  padding: 0 16rpx;
+}
+
+.fdkz-card-tag-start{
+  background: #3199ce;
+}
+
+.fdkz-card-tag-end{
+  background: #666666;
 }
 
 .fdkz-card-tag_offline{
@@ -91,6 +99,23 @@ html, body, page {
   color: #fff;
 }
 
+.new-fdkz-card-tag{
+  line-height: 36rpx;
+  position: absolute;
+  height: 36rpx;
+  /* background: rgba(244, 47, 47, 0.65);  */
+  background: #e02f2f;
+  text-align: center;
+  top: 25rpx;
+  right: 0rpx;
+  font-size: 20rpx;
+  border-radius: 18rpx 0 0 18rpx;
+  font-weight: bold;
+  padding: 0 16rpx;
+}
+
+
+
 .no-border {
   border: none;
 }
@@ -239,13 +264,12 @@ html, body, page {
 
 .noDataClass {
   text-align: center;
-  margin-top: 154rpx;
+  margin-top: 30rpx;
 }
 
 .tips {
   color: #999;
   font-size: 32rpx;
-  margin-top: 108rpx;
   position: relative;
 }
 
@@ -304,10 +328,16 @@ html, body, page {
 
 .no_exhibitionImg {
   /* width: 300rpx; */
+  height: 340rpx;
+  width: 340rpx;
+  margin: 60rpx 0;
+}
+.no_pavilionImg{
   height: 450rpx;
   width: 450rpx;
 }
 
+
 .locationBtn {
   display: inline-block;
   width: auto;

pages/cg_detail/index.wxss

@@ -70,7 +70,7 @@
   margin-bottom: 20rpx;
 }
 .cg_detail_desc_con{
-  height: 160rpx;
+  height: 150rpx;
   overflow: hidden;
 }
 .cg_detail_desc_con.noText{

pages/swkz/index.wxml

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

pages/tongcheng/index.js

@@ -10,11 +10,6 @@ const WxParse = require('../../common/component/wxParse/wxParse.js');
 const app = getApp();
 const distItems = [
   {
-    name: '综合排序',
-    id: '综合排序',
-    idx:0
-  },
-  {
     name: '按距离排序',
     id: '距离排序',
     idx: 1
@@ -57,6 +52,7 @@ Page({
     duration: 1000,
     activeIndex: 0,
     locationName: "珠海",
+    locationNameDesp:"",
     isLike: false,
     showConfirm: false,
     tag: "",
@@ -70,8 +66,8 @@ Page({
     getLocationBtn: false,
     isShow: false,
     exhiNum:0,
-    activeDist:'综合排序',
-    activeType:'全部状态'
+    activeDist:'距离排序',
+    activeType:'展览中'
   },
 
   to_search_exhibition: function () {
@@ -101,7 +97,6 @@ Page({
   onShow: function () {
     let { city, clickToSelect, collectedArr, collectedChange } = app.globalData;
     let { activeIndex, exhibitionList } = this.data
-
     if (clickToSelect) {
       // console.log(city)
       this.setData({
@@ -250,8 +245,10 @@ Page({
             locationName = locationName.substring(0, 2);
             console.log(locationName);
             app.globalData.city = locationName;
+
             this.setData({
-              locationName
+              locationName,
+              locationNameDesp: locationName
             })
             this.getList(1)
           },
@@ -270,13 +267,14 @@ Page({
   },
 
   getList: function (page) {
-    let { locationName, latitude, longitude, activeDist, activeType } = this.data;
+    let { locationNameDesp, locationName, latitude, longitude, activeDist, activeType } = this.data;
     let loginSessionKey = wx.getStorageSync("token");
     let sort = distItems.find(item => item.id === activeDist).idx
     let type = typeItems.find(item => item.id === activeType).idx
     console.log(sort, type)
     console.log(page)
     console.log(type, locationName, latitude, longitude);
+    console.log(locationNameDesp)
 
     this.setData({
       loading: true
@@ -297,7 +295,9 @@ Page({
       let { last: lastPage, totalPages, totalElements, content: exhibitionList } = res.data.data;
 
 
-     
+      exhibitionList.forEach((currentValue) => {
+        currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
+      })
 
       let { openTime } = exhibitionList;
       this.setData({
@@ -466,6 +466,7 @@ Page({
   getActiveItem:function(e){
     console.log(e)
     let { activeDist, activeType} = e.detail
+    
     this.setData({
       activeDist,
       activeType,

pages/tongcheng/index.wxml

@@ -21,10 +21,10 @@
       </view>
     </view>
   </view>
-  <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: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):('../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 fdkz-card-tag_offline">
-        <text class='fdkz-card-tag-txt'>{{item.statusText||'常设展'}}</text>
+      <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>

pages/tongcheng/search/index.js

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

pages/tongcheng/search/index.wxml

@@ -32,10 +32,10 @@
         </view>
       </view>
       <view class='city_box_con'>
-        <view class='city_box current_box' bindtap='clickItem' data-name='{{locationName}}'>
+        <view class='city_box {{cityAction == locationName ? "current_box" : "" }}' bindtap='clickItem' data-name='{{locationName}}'>
           <view>{{locationName||"珠海"}}</view>
           <view class='city_box_dec'>
-            <text>{{exhibitionNum||0}}</text>个展览</view>
+            <text class='city_box_dec_num' >{{exhibitionNum||0}}</text>个展览</view>
         </view>
       </view>
 
@@ -45,10 +45,10 @@
         </view>
       </view>
       <view class='city_box_con'>
-        <view class='city_box'wx:for="{{domesticCityList}}" bindtap='clickItem' data-name='{{item[0]}}' wx:key="index">
+        <view class='city_box {{cityAction == item[0] ? "current_box" : "" }} ' wx:for="{{domesticCityList}}" bindtap='clickItem' data-name='{{item[0]}}' wx:key="index">
           <view>{{item[0]}}</view>
           <view class='city_box_dec'>
-            <text style='color:#E65858'>{{item[1]}}</text>个展览</view>
+            <text class='city_box_dec_num'>{{item[1]}}</text>个展览</view>
         </view>
       </view>
     </view>
@@ -61,10 +61,10 @@
         </view>
       </view>
       <view class='city_box_con'>
-        <view class='city_box'wx:for="{{internationalCity}}" bindtap='clickItem' data-name='{{item[0]}}' wx:key="index">
+        <view class='city_box {{cityAction == item[0] ? "current_box" : "" }} 'wx:for="{{internationalCity}}" bindtap='clickItem' data-name='{{item[0]}}' wx:key="index">
           <view>{{item[0]}}</view>
           <view class='city_box_dec'>
-            <text style='color:#E02F2F'>{{item[1]}}</text>个展览</view>
+            <text class='city_box_dec_num'>{{item[1]}}</text>个展览</view>
         </view>
       </view>
     </view>

pages/tongcheng/search/index.wxss

@@ -94,6 +94,12 @@
 .current_box .city_box_dec{
   color:#fff;
 }
+.city_box_dec_num{
+  color:#E65858;
+}
+.current_box .city_box_dec_num{
+  color: #fff;
+}
 
 .city_box_dec{
   color:#575757;

pages/user/my_comment/index.js

@@ -32,11 +32,13 @@ Page({
   tapTodetail: function(e) {
     let {
       id,
-      product
+      product,
+      link
     } = e.currentTarget.dataset;
+    console.log(e.currentTarget)
     if (product){
       wx.navigateTo({
-        url: `../../yuezhan/pay_page/index?id=${id}`,
+        url: `../../../pages/wv_page/index?link=${escape(link)}&id=${id}`,
         success: function (res) { },
         fail: function (res) { },
         complete: function (res) { },

pages/user/my_comment/index.wxml

@@ -6,7 +6,7 @@
       <view class="weui-tab__panel">
         <view class="weui-tab__content">
           <block wx:for="{{myComment}}" wx:key="index">
-            <view data-id='{{item.exhibition.id}}' data-product="{{item.exhibition.hasProduct}}" bindtap='tapTodetail' class='weui-tab__content_item'>
+            <view data-id='{{item.exhibition.id}}' data-product="{{item.exhibition.hasProduct}}" data-link="{{item.exhibition}}"  bindtap='tapTodetail' data-link="{{item.exhibition.product.showLink}}" class='weui-tab__content_item'>
               <view class="fdkk-cells">
                 <view class="weui-cell">
                   <view class='comment-user'>

pages/user/my_contact/index.wxml

@@ -19,7 +19,7 @@
     </view>
     <view>
       <view class=' iconfont iconshangwuhezuo' ></view>
-      <text>商务合作：0756-69967966996791</text>
+      <text>商务合作：0756-6996796  6996791</text>
     </view>
     
   </view>

pages/user/my_contact/index.wxss

@@ -6,12 +6,12 @@
 }
 .logo{
   margin-top: 88rpx;
-  margin-bottom: 190rpx;
+  margin-bottom: 180rpx;
   text-align: center;
 }
 .logo image{
-  width: 250rpx;
-  height: 260rpx;
+  width: 290rpx;
+  height: 290rpx;
 }
 .joinus-title{
   color: #000;

pages/user/my_saw/index.wxml

@@ -47,6 +47,7 @@
             distance="{{item.distance}}"
             online="{{item.online}}"
             scenePv="{{item.pv}}"
+            link="{{item.product.showLink}}"
           ></component-list>
         </block>
         

pages/wv_page/index.js

@@ -1,5 +1,5 @@
 // pages/wv_page/index.js
-const { encodeParam, decodeParam } = require('../../utils/util.js');
+const { encodeParam, decodeParam, recordAccess } = require('../../utils/util.js');
 const { serverName } = require('../../utils/services');
 
 const app = getApp();
@@ -17,6 +17,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    recordAccess(options)
     console.log(options)
     let url = ''
     let { currentUrl } = app.globalData;
@@ -34,6 +35,8 @@ Page({
     
     
     // let url = wx.getStorageSync('url')
+    //记录
+
     this.setData({
       url: url
     })

pages/yuezhan/index.js

@@ -302,7 +302,8 @@ Page({
       urltype,
       hasproduct,
       haspay,
-      productlink
+      productlink,
+      id
     } = e.currentTarget.dataset;
     console.log(e.currentTarget.dataset)
 
@@ -334,7 +335,7 @@ Page({
           case 1:
             if (hasproduct) {
               wx.navigateTo({
-                url: `../wv_page/index?link=${escape(productlink)}`,
+                url: `../wv_page/index?link=${escape(productlink)}&id=${id}`,
                 success: function(res) {},
                 fail: function(res) {},
                 complete: function(res) {},

pages/yuezhan/index.wxml

@@ -21,10 +21,11 @@
   </swiper>
   <view class='yuezhan-navigator'>
     <view class='navigator-title'>推荐展览</view>
-    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link):('../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):('../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.hasProduct?'':'fdkz-card-tag_offline'}}">
-          <text class='fdkz-card-tag-txt'>{{item.statusText||'常设展'}}</text>
+        <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>
@@ -33,18 +34,18 @@
           <view class='title-txt'>
             {{item.name}}
           </view>
-          <image wx:if="{{item.hasProduct}}" mode='widthFix' class='fdkzImg' src='{{testImg}}'></image>
+          <!-- <image wx:if="{{item.hasProduct}}" mode='widthFix' class='fdkzImg' src='{{testImg}}'></image> -->
 
           <!-- <navigator url='./index' hover-stop-propagation="true" hover-class='none' data-idx="{{index}}" data-type="{{item.hasCollect}}" data-id="{{item.id}}" class="iconfont icon-like {{item.hasCollect?'icon-like_active':''}}" catchtap='addLike' style='float:right'></navigator> -->
         </view>
         <view class='fdkz-card-info-date'>
           <view class='left'>
             <view class='date-txt'>{{item.pavilionName}}</view>
-            <!-- <view class='date-day'>{{item.statusTextDesp}}</view> -->
+            <view class='date-day'>{{item.online == 1 ? '' : item.statusTextDesp}}</view>
           </view>
           <view class='right'>
-            <view class="date-icon iconfont  {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>
-            <text class='distance'>{{item.hasProduct?item.pv:(item.distance || 0 +' km')}}</text>
+            <view class="date-icon iconfont  {{item.online == 0 ?'iconweizhi':'iconredu'}}"></view>
+            <text class='distance'>{{item.online == 0 ? (item.distance || 0 )+' km' : item.pv }}</text>
           </view>
           <!-- <view class='changguan_title'>
             <text class='iconfont icon-comment'>   {{item.commentCount}}</text>

pages/yuezhan/search_result/index.js

@@ -94,6 +94,9 @@ Page({
     });
     if (activeIndex == 0) {
       this.getExhibitionSearch(1);
+      if (this.data.exhibitionList.length < 5){
+        this.popular();
+      }
     }
     else if (activeIndex == 1) {
       this.getPavilionSearch(1);
@@ -171,6 +174,12 @@ Page({
           ? this.data.exhibitionList
           : [];
         let { last: lastPage, totalPages, content: exhibitionList } = res.data.data;
+
+        exhibitionList.forEach((currentValue) => {
+          currentValue.distance = Math.ceil(currentValue.distance);
+          currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
+        })
+
         this.setData({
           currentPage: res.data.data.number+1,
           lastPage,
@@ -204,7 +213,6 @@ Page({
           : [];
         let { last: lastPage, totalPages, content: pavilionList } = res.data.data;
 
-        console.log(res)
         this.setData({
           currentPage: res.data.data.number+1,
           lastPage,
@@ -261,6 +269,32 @@ Page({
     }
   },
 
+  popular : function(){
+    wx.getLocation({
+      type: 'wgs84',
+      success: (res) => {
+        this.setData({
+          latitude: res.latitude,
+          longitude: res.longitude
+        })
+      }
+    })
+    let { latitude: lat, longitude: lng } = this.data;
+    request["recommend"]({
+      lat,
+      lng,
+    }, "", res => {
+      this.setData({
+        ExhibitionPopular: res.data.data
+      })
+      console.log(this.data.ExhibitionPopular)
+    }, err => {
+        
+    }, complete => {
+
+    })
+  },
+
   onReachBottom: function () {
     if (!this.data.loading) {
       this.loadMore();
@@ -350,7 +384,7 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-  
+    this.loadData();
   },
 
 

pages/yuezhan/search_result/index.wxml

@@ -29,10 +29,10 @@
     </view>
   </view>
 
-  <view hidden="{{activeIndex!=0}}">
+  <view class='search-container' hidden="{{activeIndex!=0}}">
     <view class="weui-tab__panel">
       <block wx:for="{{exhibitionList}}" wx:key="index">
-        <navigator hover-class='none' url="{{item.hasProduct&&!item.hasPay?('../pay_page/index?id='+item.id):(item.hasProduct?'../../wv_page/index?id='+item.id:'../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
+        <navigator hover-class='none' url="{{item.hasProduct ? ('../../wv_page/index?link='+item.product.link+'&id='+item.id):('../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
           <view class="fdkk-cells">
             <view class="weui-panel__bd">
               <view class="weui-media-box weui-media-box_appmsg">
@@ -56,8 +56,8 @@
                   <view class='desc'>
                     <view class="weui-media-box__desc">{{item.statusTextDesp}}</view>
                     <view>
-                      <view class='iconfont icon-zuobiao'></view>
-                      <text>30km</text>
+                      <view class="iconfont {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>
+                      <text>{{item.hasProduct?item.pv:(item.distance || 0 +' km')}}</text>
                     </view>
                   </view>
                 </view>
@@ -68,7 +68,7 @@
           </view>
         </navigator>
       </block>
-      <view class='noDataClass' style='margin:20% 0'  wx:if='{{exhibitionList.length === 0 && !loading }}'>
+      <view class='noDataClass'   wx:if='{{exhibitionList.length === 0 && !loading }}'>
         <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionImg}}'></image>
         <view class="tips">
           没有搜到对应的展览
@@ -77,48 +77,7 @@
     </view>
     
 
-    <view class='hot-search-con' wx:if="{{totalElements && totalElements < 5 }}">
-      <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> -->
-          <block wx:for="{{exhibitionList}}" wx:key="index">
-            <navigator hover-class='none' url="{{item.hasProduct&&!item.hasPay?('../pay_page/index?id='+item.id):(item.hasProduct?'../../wv_page/index?id='+item.id:'../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
-              <view class="fdkk-cells">
-                <view class="weui-panel__bd">
-                  <view class="weui-media-box weui-media-box_appmsg">
-                    <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
-                      <image class="weui-media-box__thumb" mode='aspectFill' src="{{ imgServer + item.imageUrl||defaultImg}}">
-                      </image>
-                    </view>
-                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
-                      <view class="weui-media-box__title weui-flex">
-                        <text class="title-txt">{{item.name}}</text>
-                        <view class="pavilionName">
-                          {{item.pavilionName}}
-                        </view>
-                      </view>
-                      
-                      <view class='desc'>
-                        <view class="weui-media-box__desc">{{item.statusTextDesp}}</view>
-                        <view>
-                          <view class='iconfont icon-zuobiao'></view>
-                          <text>30km</text>
-                        </view>
-                      </view>
-                    </view>
-                    <view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </navigator>
-          </block>
-      </view>
-    </view>
+    
 
     <!-- 没有更多内容 -->
     <!-- <view class='no-more'>
@@ -128,7 +87,7 @@
   </view>
 
 
-  <view hidden="{{activeIndex!=1}}">
+  <view class='pavilionList-container' hidden="{{activeIndex!=1}}">
     <view class="weui-tab__panel">
       <block wx:for="{{pavilionList}}" wx:key="index">
         <navigator hover-class='none' url="{{'../../cg_detail/index?id='+item.id}}" class='weui-tab__content_item'>
@@ -155,7 +114,7 @@
       </block>
       
       <view class='noDataClass' wx:if='{{pavilionList.length === 0 && !loading}}'>
-        <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionHallImg}}'></image>
+        <image class='no_pavilionImg' mode='aspectFit' src='{{noExhibitionHallImg}}'></image>
         <view class="tips">
           没有搜到对应的展馆
         </view>
@@ -164,6 +123,49 @@
     </view>
   </view>
 
+  <view class='hot-search-con' wx:if="{{totalElements < 5 }}">
+      <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> -->
+          <block wx:for="{{ExhibitionPopular}}" wx:key="index">
+            <navigator hover-class='none' url="{{item.hasProduct ? ('../../wv_page/index?link='+item.product.link+'&id='+item.id):('../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
+              <view class="fdkk-cells">
+                <view class="weui-panel__bd">
+                  <view class="weui-media-box weui-media-box_appmsg">
+                    <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
+                      <image class="weui-media-box__thumb" mode='aspectFill' src="{{ imgServer + item.imageUrl||defaultImg}}">
+                      </image>
+                    </view>
+                    <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                      <view class="weui-media-box__title weui-flex">
+                        <text class="title-txt">{{item.name}}</text>
+                        <view class="pavilionName">
+                          {{item.pavilionName}}
+                        </view>
+                      </view>
+                      
+                      <view class='desc'>
+                        <view class="weui-media-box__desc">{{item.statusTextDesp}}</view>
+                        <view>
+                          <view class="iconfont {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>
+                          <text>{{item.hasProduct?item.pv:(item.distance || 0 +' km')}}</text>
+                        </view>
+                      </view>
+                    </view>
+                    <view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </navigator>
+          </block>
+      </view>
+    </view>
+
   <view class="weui-loadmore" wx:if="{{loading}}">
     <view class="weui-loading"></view>
     <view class="weui-loadmore__tips">正在加载</view>

pages/yuezhan/search_result/index.wxss

@@ -1,9 +1,14 @@
 /* pages/yuezhan/search/index.wxss */
 
 .container {
-  background: #fff;
+  background: #F5F5F5;
   padding: 0;
 }
+.search-container, .pavilionList-container{
+  background: #fff;
+  padding-bottom: 74rpx;
+}
+
 .top-nav{
   width: 100%;
   background: #fff;
@@ -14,10 +19,12 @@
 }
 
 .hot-search {
-  padding: 0 44rpx;
-  margin-top: 72rpx;
+  padding: 40rpx 44rpx 72rpx 44rpx;
+  margin-top: 44rpx;
   font-size: 32rpx;
   font-weight: bold;
+  background: #fff;
+  padding-top: 40rpx;
 }
 
 .hot-search-title-txt {
@@ -46,10 +53,9 @@
 }
 
 .weui-tab__panel {
+  background: #fff;
   padding: 0 44rpx;
-  margin-top: 6rpx;
   overflow-x: hidden;
-  margin-bottom: 20rpx;
 }
 
 .weui-media-box_appmsg {
@@ -87,7 +93,7 @@
    overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap; 
-   width: 400rpx; 
+   width: 390rpx; 
   display: inline-block;
   margin-bottom: 12rpx;
 }
@@ -158,8 +164,8 @@
   justify-content: space-between;
   font-weight: normal;
 }
-.weui-media-box__bd_in-appmsg .desc .icon-zuobiao{
-  font-size: 22rpx;
+.weui-media-box__bd_in-appmsg .desc .iconweizhi, .weui-media-box__bd_in-appmsg .desc .iconredu{
+  font-size: 20rpx;
   display: inline-block;
   vertical-align: text-bottom;
   margin-right: 12rpx;
@@ -212,3 +218,6 @@
   font-size: 28rpx;
   text-align: center;
 }
+.hot-search-con{
+  margin-top: 40rpx;
+}

pages/zl_detail/create_evaluation/index.js

@@ -62,6 +62,7 @@ Page({
       content,
       exhibitionId
     } = this.data;
+
     let currentStar = this.wxStarCont() / 2;
 
     let loginSessionKey = wx.getStorageSync('token') || "";
@@ -75,8 +76,8 @@ Page({
       }, "post", res => {
         if (res.data.code > -1) {
           Toast.showToast('tip', "评论成功", success => {
-            wx.redirectTo({
-              url: `../../yuezhan/comment_detail/index?id=${exhibitionId}`,
+            wx.navigateBack({
+              url: `../../../pages/zl_detail/index?id=${exhibitionId}`,
               success: function (res) { },
               fail: function (res) { },
               complete: function (res) { },

pages/zl_detail/index.js

@@ -47,7 +47,7 @@ Page({
   },
   readMore: function () {
     this.setData({
-      readActive: !this.data.readActive
+      readActive: true
     })
   },
   fix_starImg: function (points) {
@@ -242,6 +242,13 @@ Page({
     })
     // }
   },
+  
+  clickCell: function () {
+    console.log(this.data.active);
+    this.setData({
+      active: !this.data.active
+    })
+  },
 
   navigateToLocation: function () {
     let { latitude, longitude, addressName } = this.data;

pages/zl_detail/index.wxml

@@ -3,7 +3,7 @@
 
 <view class='container' wx:hidden="{{!exhibitionDetail}}">
   <view class='zl_detail_bg'>
-    <image mode="aspectFill" class='zl_detail_bg_img' src="{{imgServer + exhibitionDetail.imageUrl||defaultImg}}"></image>
+    <image wx:if="{{exhibitionDetail.imageUrl}}" mode="aspectFill" class='zl_detail_bg_img' src="{{imgServer + exhibitionDetail.imageUrl||defaultImg}}"></image>
   </view>
   <view class='zl_detail_info'>
     <view class='zl_detail_info_title'>
@@ -22,9 +22,9 @@
       <view class='iconfont iconriqi'></view>
       <text class='cg_detail_time'>{{exhibitionDetail.openTime}}</text>
     </view>
-    <view class='cg_detail_time_warpper'>
+    <view class='cg_detail_time_warpper' wx:if="{{exhibitionDetail.openTimeDetail}}">
       <view class='iconfont iconshijian'></view>
-      <text class='cg_detail_time'>{{exhibitionDetail.statusTextDesp}}</text>
+      <text class='cg_detail_time'>{{exhibitionDetail.openTimeDetail}}</text>
     </view>
     <view class='cg_detail_time_warpper'>
       <view class='iconfont iconpiaowu'></view>
@@ -35,9 +35,17 @@
       <text class='cg_address'>{{exhibitionDetail.address}}</text>
       <view class='iconfont iconkedianjibiaoshiicon'></view>
     </navigator>
-    <view class='zl_detail_con'>
-      <!-- <template is="wxParse" data="{{wxParseData:description.nodes}}" /> -->
+
+    <view class='cg_detail_desc'>
+      <view class='cg_detail_desc_con {{ exhibitionDetail.description ? "" : "noText"  }} '  >
+        <view class='zl_detail_con {{active ? "active" : ""}}'>
+          <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+        </view>
+        <text wx:if="{{!exhibitionDetail.description}}" >暂无简介</text>
+      </view>
+      <view wx:if="{{exhibitionDetail.description}}" class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell' >{{active ? "" : "查看更多内容" }}</view>
     </view>
+    
   </view>
   <view class='zl_artist' wx:if="{{exhibitionDetail.pavilions.length>0}}">
 
@@ -56,14 +64,14 @@
 
   </view>
   <view class='tour_guide'>
-    <view class='fdkk-cells' style='padding: 0;padding-bottom:30rpx;margin-bottom:0;'>
+    <view class='fdkk-cells' style='padding: 0;padding-bottom:74rpx;margin-bottom:0;'>
       <view class='weui-cell fix-padding'>
         <view class='weui-cell__bd' style='padding:0 30rpx;'>
           <text class='sub_bar_title'>热门评论</text>
           <text bindtap='tapToComement' class='write_comment'>写评论</text>
         </view>
       </view>
-      <view wx:for="{{comments.content}}" wx:if="{{!(index>2)||readActive}}" wx:key="index" class='comment_con'>
+      <view wx:for="{{comments.content}}" wx:if="{{!(index>10)||readActive}}" wx:key="index" class='comment_con'>
         <view class="weui-cell" style='align-items: flex-start;padding-bottom:30rpx;'>
           <view class="weui-cell__hd">
             <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
@@ -71,7 +79,8 @@
             </view>
           </view>
           <view class="weui-cell__bd">
-            <view class="comment-username">
+          <view class='comment-left'>
+          <view class="comment-username">
               <text style='font-size:30rpx;'>{{item.nickName}}</text>
 
             </view>
@@ -84,14 +93,19 @@
 
             </view>
             <view class="comment-dec " bindtap='addCommentLike' data-idx="{{index}}" data-type="{{item.hasLike}}" data-id="{{item.id}}">
+          </view>
+                          
+              <!-- <text class="iconfont icon-zan {{item.hasLike?'icon-zan_active':''}}"><text style='margin-left:10rpx;'>{{item.likeCount}}</text></text> -->
+            </view>
+            <view class='comment-right'>
               <text>{{item.dateTimeDeatil}}</text>
-              <text class="iconfont icon-zan {{item.hasLike?'icon-zan_active':''}}"><text style='margin-left:10rpx;'>{{item.likeCount}}</text></text>
             </view>
           </view>
         </view>
       </view>
-      <view class='shensuo' bindtap="{{comments.content.length>0?'tapToCommentDetail':''}}">
-        <text class="">{{comments.content.length>0?"查看更多评论"+'('+comments.content.length+')':"没有更多啦"}}</text>
+      <!-- <view class='shensuo' bindtap="{{comments.content.length>0?'tapToCommentDetail':''}}"> -->
+      <view class='shensuo' wx:if="{{comments.content.length >= 10}}" bindtap="readMore" >
+        <text class="">{{readActive ? "" : "查看更多内容" }}</text>
       </view>
     </view>
   </view>

pages/zl_detail/index.wxss

@@ -17,7 +17,7 @@
 }
 
 .zl_detail_info {
-  padding: 30rpx 30rpx 10rpx 30rpx;
+  padding: 30rpx 30rpx 0rpx 30rpx;
   background: #fff;
 }
 
@@ -60,7 +60,6 @@
 
 .weui-cell {
   padding: 20rpx 0 40rpx;
-  border-bottom: 2rpx #ddd solid;
 }
 
 .weui-media-box__hd_avatar {
@@ -86,6 +85,7 @@
 .shensuo {
   text-align: center;
   font-size: 28rpx;
+  margin-top: 30rpx;
 }
 
 .fdkk-cells {
@@ -261,7 +261,7 @@
   margin: 30rpx 0;
 }
 .cg_address_warpper{
-  margin-bottom: 100rpx;
+  margin-bottom: 90rpx;
 }
 
 .cg_detail_time_warpper .iconfont,.cg_address_warpper .iconfont{
@@ -289,8 +289,9 @@
   font-size: 22rpx!important;
 }
 
-.zl_detail_con{
-  margin-bottom: 40rpx;
+
+.cg_detail_desc {
+  padding-bottom: 72rpx;
 }
 
 .pav_item{
@@ -319,4 +320,59 @@
 
 .iconyishoucang{
   color: #e02f2f;
-}
+}
+
+.weui-cell__hd .weui-media-box__hd_in-appmsg {
+  width: 82rpx;
+  height: 82rpx;
+  border-radius: 50%;
+  overflow: hidden;
+}
+
+.comment_con .weui-cell__bd{
+  display: flex;
+}
+.comment-username{
+  font-size: 28rpx;
+  font-weight: bold;
+}
+
+.comment-right{
+  flex: 1;
+  text-align: right;
+  color: #646464;
+  font-size: 26rpx;
+}
+.comment-detail{
+  color: #646464;
+  font-size: 26rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: 350rpx;
+}
+
+.cg_detail_desc{
+  overflow: hidden;
+  text-align:justify;
+}
+.zl_detail_con{
+  height: 150rpx;
+  overflow: hidden;
+  font-size: 32rpx;
+  color: #646464;
+}
+.zl_detail_con.noText{
+  height: auto;
+}
+.zl_detail_con.active{
+  height: auto;
+}
+.cg_detail_descMore{
+  text-align: center;
+  font-size: 28rpx;
+  margin-top: 100rpx;
+}
+.cg_detail_descMore.active{
+  margin-top:0;
+}

project.config.json

@@ -32,7 +32,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 11,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,

utils/services.js

@@ -3,10 +3,10 @@ const {
 } = require('./util');
 
 //const serverName = 'https://www.4dmuseum.cn'; // 正式
-const serverName = 'http://192.168.0.100:8081'; // 本地
+const serverName = 'http://192.168.0.177:8081'; // 本地
 
-const imgServer = 'https://www.4dmuseum.cn'
-//const imgServer = ''
+//const imgServer = 'https://www.4dmuseum.cn/'
+const imgServer = ''
 
 const urls = {
   //用户API
@@ -63,7 +63,10 @@ const urls = {
   commentLike: '/wx/api/comment/like',
 
   //未读
-  longPolling: '/wx/api/user/longPolling'
+  longPolling: '/wx/api/user/longPolling',
+
+  //热门推荐
+  recommend: '/wx/api/exhibition/recommend'
 };
 // 上传路径
 const uploadUrls = {};

utils/util.js

@@ -1,5 +1,7 @@
 const QQMapWX = require('../common/component/mapSDK/qqmap-wx-jssdk.min.js');
+const app = require('../app.js');
 
+console.log('jkaslasjdia',app)
 var regChar = { //非特殊字符作为值
   '?':'qweqwqjoijweq',
   '&':'asdauihdasfsdas',
@@ -187,6 +189,31 @@ class Toast {
     wx.hideLoading();
   }
 }
+//记录访问id 存储在全局
+function recordAccess(options){
+  if(!options.id)return;
+  let {
+    cookieIDs = []
+  } = app.default.globalData;
+  let id = options.id;
+
+  for (let i = 0; i < cookieIDs.length; i++) {
+    if (cookieIDs[i] && id == cookieIDs[i]) {
+      cookieIDs = removeArrItem(cookieIDs, cookieIDs[i])
+
+    }
+  }
+
+  if (id != undefined && (typeof (Number(id)) == 'number')) {
+    cookieIDs.unshift(id)
+  }
+  console.log(id)
+
+  app.default.globalData.cookieIDs = cookieIDs
+
+
+  console.log(app.default.globalData.cookieIDs)
+}
 
 module.exports = {
   formatTime,
@@ -203,6 +230,7 @@ module.exports = {
   bindInput,
   encodeParam,
   decodeParam,
+  recordAccess,
   Toast: new Toast(),
   qqmapsdk: new QQMapWX({
     key: '2Z3BZ-H7EWO-F4YWX-SG5JF-2VOK2-S2FUB'