commit in 3.4

app.json

@@ -42,13 +42,13 @@
       },
       {
         "pagePath": "pages/swkz/index",
-        "text": "四维看展",
+        "text": "线上看展",
         "iconPath": "imgs/swkz.png",
         "selectedIconPath": "./imgs/swkz_active.png"
       },
       {
         "pagePath": "pages/tongcheng/index",
-        "text": "同城展会",
+        "text": "线下看展",
         "iconPath": "imgs/tongcheng.png",
         "selectedIconPath": "./imgs/tongcheng_active.png"
       },

app.wxss

@@ -14,9 +14,7 @@ html, body, page {
 
 .container {
   font-size: 30rpx;
-  background: #F5F5F5;
-  border-top: 1rpx solid transparent;
-  /* padding-bottom: 10rpx; */
+  background: #fff;
   box-sizing: border-box;
   min-height: 100%;
   flex: 1;
@@ -29,11 +27,9 @@ html, body, page {
 
 .fdkz-card {
   position: relative;
-  display: flex;
-  flex-direction: column;
   width: 100%;
-  height: 568rpx;
   overflow: hidden;
+  margin-bottom: 74rpx;
 }
 
 .fdkz-card-img {
@@ -43,19 +39,20 @@ html, body, page {
 }
 
 .fdkz-card-info {
-  height: 100rpx;
   background: #fff;
-  flex-direction: column;
-  padding-top: 20rpx;
 }
 
 .fdkz-card-info-title {
-  line-height: 40rpx;
   display: flex;
   align-items: center;
+  margin-top: 20rpx;
+  font-size: 36rpx;
+  font-weight: bold;
 }
 
 .fdkz-card-info-date {
+  display: flex;
+  margin-top: 23rpx;
   color: #646464;
   font-size: 24rpx;
 }
@@ -236,14 +233,14 @@ html, body, page {
 
 .noDataClass {
   text-align: center;
-  margin-top: 50%;
+  margin-top: 154rpx;
 }
 
 .tips {
   color: #999;
-  font-size: 38rpx;
+  font-size: 32rpx;
+  margin-top: 108rpx;
   position: relative;
-  left: -10rpx;
 }
 
 .fdkzImg {
@@ -301,7 +298,8 @@ html, body, page {
 
 .no_exhibitionImg {
   /* width: 300rpx; */
-  height: 230rpx;
+  height: 450rpx;
+  width: 450rpx;
 }
 
 .locationBtn {
@@ -313,7 +311,7 @@ html, body, page {
 }
 
 .exhibitionDetailName {
-  display: inline-block;
+  font-size: 40rpx;
   width: 468rpx;
     overflow: hidden;
   text-overflow: ellipsis;
@@ -324,9 +322,8 @@ html, body, page {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  /* width: 400rpx; */
   flex: 1;
-  display: inline-block;
+  display: block;
 }
 .nav_bar{
   display: flex;

pages/cg_detail/cg_introduce/index.js

@@ -1,109 +1,15 @@
-// pages/zl_detail/index.js
-const { request, serverName } = require('../../../utils/services');
-const WxParse = require('../../../common/component/wxParse/wxParse.js');
-
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-    testImg: '../../../imgs/testImg/thumbSmallImg2.jpg',
-    avatar: '../../../imgs/testImg/1.jpg',
-    icon_quanping:'../../../imgs/quanping.png',
-    tour_info_data:[{
-      title:'地址：',
-      txt:'北京市朝阳区崔各乡庄各庄村顺白马路马嘻路口100米路北'
-    }, {
-      title: '开放时间',
-      txt: '周二到周日10：00-18：00 （每周一闭馆）'
-      }, {
-        title: '电话：',
-        txt: '+86 10 8456654654'
-      }]
-    
-  },
-  to_search: function () {
-    wx.navigateTo({
-      url: './cg_introduce/index',
-      success: function (res) { },
-      fail: function (res) { },
-      complete: function (res) { },
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      pavilionId: options.id,
-    }),
-      this.getPavilionDetail();
-  },
-
-  getPavilionDetail: function () {
-    let pavilionId = this.data.pavilionId;
-    request["getPavilionDetail"]({
-      pavilionId: pavilionId
-    },'get', res => {
-      let { data: pavilionDetail } = res.data;
-      let { description } = pavilionDetail;
-      console.log(description)
-      
-      this.setData({
-        pavilionDetail,
-      });
-      WxParse.wxParse('description', 'html', description, this, 5);
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-  
+    latitude: 23.099994,
+    longitude: 113.324520,
+    markers: [{
+      id: 1,
+      latitude: 23.099994,
+      longitude: 113.324520,
+      name: 'T.I.T 创意园'
+    }]
+  },
+  onReady: function (e) {
+    this.mapCtx = wx.createMapContext('myMap')
   }
-})
+})

pages/cg_detail/cg_introduce/index.wxml

@@ -1,8 +1,12 @@
-<!--pages/cg_detail/index.wxml-->
-<import src="../../../common/component/wxParse/wxParse.wxml" />
-
-<view class='container'>
-  <view class='cg_intro_con'>
-    <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+<view class="page-body">
+  <view class="page-section page-section-gap">
+    <map
+      id="myMap"
+      style="width: 100%; height: 100%;"
+      latitude="{{latitude}}"
+      longitude="{{longitude}}"
+      markers="{{markers}}"
+      show-location
+    ></map>
   </view>
-</view>
+</view>

pages/cg_detail/cg_introduce/index.wxss

@@ -1,112 +1,16 @@
-/* pages/cg_detail/index.wxss */
-@import "../../../common/component/wxParse/wxParse.wxss";
-
-.container {
-  padding: 20rpx;
-  /* background: #eee; */
-}
-.cg_intro_con view{
-  overflow: hidden;
-}
-
-.cg_detail_bg {
-  height: 440rpx;
-}
-
-.cg_detail_bg_img {
-  width: 100%;
-  height: 440rpx;
-}
-
-.cg_detail_info {
-  padding: 30rpx 0;
-  background: #fff;
-}
-
-.cg_detail_info_top {
-  padding-bottom: 20rpx;
-  border-bottom: 2rpx #999 solid;
-}
-
-.cg_detail_info_top_flex {
-  display: inline-block;
-  flex-direction: column;
-}
-
-.cg_detail_info_top_img_flex {
-  float: right;
-}
-
-.cg_detail_info_top_flex_img {
-  width: 110rpx;
-  height: 110rpx;
-}
-
-.cg_detail_container {
-}
-
-.cg_detail_txt {
-  text-align: justify;
-  word-break: break-all;
+.page-section-gap{
+  height: 100%;
   box-sizing: border-box;
-  margin: 30rpx 0;
-}
-
-.cg_detail_info_title {
-  line-height: 50rpx;
-  font-size: 36rpx;
-  font-weight: bolder;
-  margin-bottom: 10rpx;
-}
-
-.iconfont {
-  color: #999;
-}
-
-.like-num {
-  font-size: 20rpx;
-  font-weight: normal;
-  position: absolute;
-  top: 40rpx;
-  left: 6rpx;
-}
-
-.cg_detail_info_subTxt {
-  line-height: 40rpx;
-  margin-bottom: 20rpx;
-}
-
-.icon-time, .icon-piaowu {
-  font-size: 40rpx;
-  vertical-align: middle;
-}
-
-.cg_detail_info_subTxt_title {
-  vertical-align: middle;
-  margin-left: 10rpx;
-}
-
-.cg_detail_info_subTxt_txt {
-  vertical-align: middle;
-  color: #999;
-  font-size: 28rpx;
+  padding: 20rpx;
 }
-
-.weui-cell {
-  padding: 20rpx 0 40rpx;
-  border-bottom: 2rpx #ddd solid;
+page {
+  background-color: #F8F8F8;
+  height: 100%;
+  font-size: 32rpx;
+  line-height: 1.6;
 }
 
-.weui-media-box__hd_avatar {
-  width: 80rpx;
-  height: 80rpx;
-  padding-right: 20rpx;
-  padding-top: 10rpx;
-}
-
-.cg_detail {
-  text-align: justify;
-  word-break: break-all;
-  box-sizing: border-box;
+.page-body {
+  height: 100%;
 }
 

pages/cg_detail/index.js

@@ -15,6 +15,7 @@ Page({
     avatar: '../../imgs/testImg/1.jpg',
     icon_quanping:'../../imgs/quanping.png',
     animationData: {},
+    active: false,
     isLike: false,
     longitude: 113.324520,
     latitude: 23.099994,
@@ -32,37 +33,45 @@ Page({
     relatedActivitiesLength:0,
     
   },
-  to_search: function () {
-    wx.navigateTo({
-      url: `./cg_introduce/index?id=${this.data.pavilionId}`,
-      success: function (res) { },
-      fail: function (res) { },
-      complete: function (res) { },
-    })
-  },
+  // to_search: function () {
+  //   wx.navigateTo({
+  //     url: `./cg_introduce/index?id=${this.data.pavilionId}`,
+  //     success: function (res) { },
+  //     fail: function (res) { },
+  //     complete: function (res) { },
+  //   })
+  // },
 
   readMore: function () {
-    let readActive=!this.data.readActive,
+    let readActive= !this.data.readActive,
       relatedActivities = this.data.pavilionDetail.relatedActivities,
       pavilionDetail = this.data.pavilionDetail,
       fullRelatedActivities = this.data.relatedActivities;
     
-    switch (readActive){
-      case false:
-        relatedActivities.length = relatedActivities.length > 3 ? 3 : relatedActivities.length;
-        pavilionDetail.relatedActivities = relatedActivities;
-        break;
-      case true:
-        relatedActivities.length = this.data.relatedActivitiesLength;
-        pavilionDetail.relatedActivities = fullRelatedActivities;
+    // if (readActive){
+    //   relatedActivities.length = relatedActivities.length > 3 ? 3 : relatedActivities.length;
+    //   pavilionDetail.relatedActivities = relatedActivities;
+    // }
+
+    // switch (readActive){
+    //   case false:
+    //     relatedActivities.length = relatedActivities.length > 3 ? 3 : relatedActivities.length;
+    //     pavilionDetail.relatedActivities = relatedActivities;
+    //     break;
+    //   case true:
+    //     relatedActivities.length = this.data.relatedActivitiesLength;
+    //     pavilionDetail.relatedActivities = fullRelatedActivities;
         
-        break;
-    }
+    //     break;
+    // }
+
+    
     this.setData({
-      readActive,
+      readActive:true,
       pavilionDetail
     })
   },
+  
 
   /**
    * 生命周期函数--监听页面加载
@@ -121,7 +130,7 @@ Page({
     },"", res => {
       let { data: pavilionDetail } = res.data;
       let { description, relatedActivities, openTime } = pavilionDetail;
-      
+
       let lessRelatedActivities = [];
       this.setData({
         pavilionDetail,
@@ -132,8 +141,17 @@ Page({
       WxParse.wxParse('openTime', 'html', openTime, this, 5);
 
       console.log(pavilionDetail)
+      console.log(description)
+    })
+  },
+  clickCell: function () {
+    console.log(this.data.active);
+    this.setData({
+      active: !this.data.active
     })
   },
+ 
+
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/cg_detail/index.wxml

@@ -2,44 +2,71 @@
 <import src="../../common/component/wxParse/wxParse.wxml" />
 
 <view class='container'>
-  <view class='cg_detail_bg'>
-    <image class='cg_detail_bg_img' mode="aspectFill" src="{{pavilionDetail.imageUrl||defaultImg}}"></image>
-  </view>
-  <view class='cg_detail_info'>
-    <view class='cg_detail_info_top' style='margin-bottom:20rpx;'>
-      <view class='cg_detail_info_top_flex'>
-        <view class='cg_detail_info_title'>
-          <text  class='exhibitionDetailName' style='width:550rpx;'>{{pavilionDetail.name}}</text>
-        </view>
-         <view class='cg_detail_info_subTxt'>
-          <text decode='true' class='cg_detail_info_subTxt_txt'>{{pavilionDetail.enName}}&nbsp;</text>
-        </view> 
+  <view class='scene-introduction'>
+      <view class='cg_detail_bg'>
+        <image class='cg_detail_bg_img' mode="aspectFill" src="{{pavilionDetail.imageUrl||defaultImg}}"></image>
       </view>
-      <view class='cg_detail_info_top_img_flex'>
-        <image class='cg_detail_info_top_flex_img' mode='aspectFill' src="{{pavilionDetail.logoUrl||defaultImg}}"></image>
-      </view>
-    </view>
-    <view class="cg_detail_container">
-      <view style='height:190rpx;overflow:hidden'>
-      <template is="wxParse" data="{{wxParseData:description.nodes}}" />
-      </view>
-      <view style='margin-top:10rpx;'>
-        <view class='weui-cell no-border' style='padding:0'>
-          <view class='weui-cell__bd'>
+      <view class='cg_detail_info'>
+        <view class='cg_detail_info_top' style='margin-bottom:20rpx;'>
+          <view class='cg_detail_info_top_img_flex'>
+            <image class='cg_detail_info_top_flex_img' mode='aspectFill' src="{{pavilionDetail.logoUrl||defaultImg}}"></image>
+          </view>
+          <view class='cg_detail_info_top_flex'>
+            <view class='cg_detail_info_title'>
+              <text  class='exhibitionDetailName' style='width:550rpx;'>{{pavilionDetail.name}}</text>
+            </view>
+            <view class='cg_detail_info_subTxt'>
+              <text decode='true' class='cg_detail_info_subTxt_txt'>{{pavilionDetail.enName}}&nbsp;</text>
+            </view> 
+          </view>
+        </view>
+
+        <!-- <view class="cg_detail_container">
+          <view style='height:190rpx;overflow:hidden'>
+          <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+          </view>
+          <view style='margin-top:10rpx;'>
+            <view class='weui-cell no-border' style='padding:0'>
+              <view class='weui-cell__bd'>
+              </view>
+              <view class='weui-cell__ft weui-cell__ft_in-access' style='font-size:28rpx' bindtap='to_search'>查看更多</view>
+            </view>
+          </view>
+        </view> -->
+
+        <view class='cg_detail_warpper'>
+          <view class='cg_detail_time_warpper'>
+            <view class='iconfont icon-shijian' ></view>
+            <text class='cg_detail_time'>{{pavilionDetail.openTime}} 提前一个小时入馆 周一闭馆</text>
+          </view>
+          <navigator class='cg_address_warpper' url="./cg_introduce/index?id={{pavilionId}}">
+            <view class=' iconfont icon-zuobiao'></view>
+            <text class='cg_address'>{{pavilionDetail.address}}</text>
+            <view class='iconfont icon-youbian'></view>
+          </navigator>
+
+          <view class='cg_detail_title'>展厅简介</view>
+
+          <view class='cg_detail_desc'>
+            <view class='cg_detail_desc_con {{ active ? "active" : ""  }}'  >
+              <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+            </view>
+            <view class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell' >{{active ? "" : "查看更多内容" }}</view>
           </view>
-          <view class='weui-cell__ft weui-cell__ft_in-access' style='font-size:28rpx' bindtap='to_search'>查看更多</view>
+
         </view>
       </view>
-    </view>
   </view>
+
   <view class='cg_artist' wx:if="{{pavilionDetail.relatedActivities.length}}">
-    <view class='fdkk-cells' style='padding:0'>
+    <view class='fdkk-cells' >
       <view class='tab-bar'>
-        <view class='weui-cell' style='margin:20rpx 30rpx 0;padding-bottom:10rpx;border-bottom:none'>
+        <view class='weui-cell' >
           <view class='weui-cell__bd'>
-            <text class='sub_bar_title'>展览</text>
+            <text class='sub_bar_title'>正在展出</text>
           </view>
-          <view style='font-size:28rpx' class="weui-cell__ft weui-cell__ft_in-access  fix_weui-cell__ft_in-access {{readActive?'weui-cell__ft_in-access_active':''}}" bindtap='readMore'>全部（{{relatedActivitiesLength}}）</view>
+          <!-- <view style='font-size:28rpx' class="weui-cell__ft weui-cell__ft_in-access  fix_weui-cell__ft_in-access {{readActive?'weui-cell__ft_in-access_active':''}}" bindtap='readMore'>全部（{{relatedActivitiesLength}}）</view> -->
+          <view  class="weui-cell__ft   fix_weui-cell__ft_in-access " >全部（{{relatedActivitiesLength}}）</view>
         </view>
       </view>
       <view class='artist_avatar'>
@@ -56,27 +83,27 @@
               <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='date-txt'>{{item.pavilionName}}丨{{item.statusTextDesp}}</view>
-              <view class='changguan_title'>
+              <view class='date-txt'>{{item.pavilionName}}</view>
+              <!-- <view class='changguan_title'>
                 <text class='iconfont icon-comment'>   {{item.commentCount||0}}</text>
                 <text class='iconfont icon-view'>   {{item.pv||0}}</text>
                 <!-- <text class='iconfont icon-empty_like'>   {{item.collectionsCount}}</text> -->
-
-                <text data-idx="{{index}}" data-type="{{item.hasCollect}}" data-id="{{item.id}}" class="iconfont  {{item.hasCollect?'icon-like':'icon-empty_like'}}">   {{item.collectionsCount||0}}</text>
-              </view>
+                <!-- <text data-idx="{{index}}" data-type="{{item.hasCollect}}" data-id="{{item.id}}" class="iconfont  {{item.hasCollect?'icon-like':'icon-empty_like'}}">   {{item.collectionsCount||0}}</text>
+              </view> --> 
+              <view>{{item.statusTextDesp}}</view>
             </view>
-            <text></text>
           </view>
         </navigator>
       </view>
+      <view class='fdkz-card-info-date-more' bindtap='readMore' >{{(readActive || relatedActivitiesLength < 3) ? "没有更多内容" : "查看更多内容" }}</view>
     </view>
   </view>
-  <view class='tour_guide' wx:if="{{pavilionDetail.address||pavilionDetail.openTime||pavilionDetail.pavilions[0].tel}}">
+  <!-- <view class='tour_guide' wx:if="{{pavilionDetail.address||pavilionDetail.openTime||pavilionDetail.pavilions[0].tel}}">
     <view class='fdkk-cells' style='padding: 0;margin-bottom:0'>
       <view class='weui-cell fix-padding'>
         <view class='weui-cell__bd' style='padding:0 30rpx;'>
@@ -106,5 +133,5 @@
         </view>
       </view>
     </view>
-  </view>
+  </view> -->
 </view>

pages/cg_detail/index.wxss

@@ -7,45 +7,111 @@
   background: #eee;
 }
 
-.cg_detail_bg {
-  height: 440rpx;
-}
-
 .cg_detail_bg_img {
   width: 100%;
-  height: 440rpx;
+  height: 542rpx;
 }
 
 .cg_detail_info {
-  padding: 30rpx 30rpx 10rpx 30rpx;
+  padding: 30rpx 44rpx 10rpx 44rpx;
   background: #fff;
 }
 
 .cg_detail_info_top {
+  display: flex;
   padding-bottom: 20rpx;
-  border-bottom: 2rpx #ddd solid;
 }
-
+.cg_detail_info_top_img_flex{
+  margin-right: 48rpx;
+  width: 82rpx;
+  height: 82rpx;
+  border-radius: 50%;
+  border: 1px solid #ccc;
+  overflow: hidden;
+}
 .cg_detail_info_top_flex {
   display: inline-block;
   flex-direction: column;
   width: 560rpx;
 }
-.cg_detail_container{
-  /* display: inline-block; */
-  /* height: 100rpx; */
-}
+
 .cg_detail_container view{
   overflow: hidden;
 }
+.cg_detail_time_warpper .iconfont{
+  color: #000;
+  font-size: 28rpx;
+  display: inline-block;
+  vertical-align: text-bottom;
+  font-weight: bold;
+  margin-right: 36rpx;
+}
+.cg_detail_time{
+  font-size: 26rpx;
+}
+.cg_detail_warpper{
+  margin-top: 40rpx;
+}
+.cg_address_warpper{
+  display: flex;
+  align-items: center;
+  margin-top: 30rpx;
+  margin-bottom: 74rpx;
+}
+.cg_detail_title{
+  font-size: 37rpx;
+  font-weight: bold;
+  margin-bottom: 76rpx;
+}
+.cg_detail_desc{
+  overflow: hidden;
+  color: #646464;
+  text-align:justify;
+}
+.cg_detail_desc_con{
+  height: 160rpx;
+  overflow: hidden;
+}
+.cg_detail_desc_con.active{
+  height: auto;
+}
+.cg_detail_descMore{
+  text-align: center;
+  font-size: 28rpx;
+  margin-top: 100rpx;
+  margin-bottom: 66rpx;
+}
+.cg_detail_descMore.active{
+  margin: 0;
+}
 
-.cg_detail_info_top_img_flex {
-  float: right;
+.cg_address_warpper .iconfont{
+  display: inline-block;
+  color: #000;
+  vertical-align: text-bottom;
+  font-size: 26rpx;
+  font-weight: bold;
+  margin-right: 36rpx;
+}
+.cg_address{
+  width: 510rpx;
+  font-size: 26rpx;
+  color: #E02F2F;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+  display: block;
+}
+.cg_address_warpper .icon-youbian{
+  color:  #E02F2F;
+  vertical-align: middle;
+  margin-left: 18rpx; 
+  margin-right: 0rpx;
 }
 
 .cg_detail_info_top_flex_img {
-  width: 110rpx;
-  height: 110rpx;
+  height: 100%;
+  display: block;
 }
 
 .cg_detail_txt {
@@ -56,9 +122,7 @@
 }
 
 .cg_detail_info_title {
-  line-height: 50rpx;
-  font-size: 36rpx;
-  /* margin-bottom: 60rpx; */
+  margin-bottom: 10rpx;
 }
 
 .iconfont {
@@ -81,8 +145,7 @@
 }
 
 .cg_detail_info_subTxt {
-  line-height: 40rpx;
-  margin-bottom: 20rpx;
+  font-size: 26rpx;
 }
 
 .icon-time, .icon-piaowu {
@@ -98,14 +161,16 @@
 .cg_detail_info_subTxt_txt {
   vertical-align: middle;
   color: #999;
-  font-size: 30rpx;
+  font-size: 26rpx;
 }
 
 .weui-cell {
-  padding: 20rpx 0 40rpx;
-  border-bottom: 2rpx #ddd solid;
+  padding: 46rpx 0 28rpx 0;
+}
+.weui-cell__ft{
+  font-size: 26rpx;
+  color: #000;
 }
-
 .weui-media-box__hd_avatar {
   width: 80rpx;
   height: 80rpx;
@@ -125,8 +190,8 @@
 
 .fdkk-cells {
   background: #fff;
-  margin: 20rpx 0;
-  padding: 0 30rpx 20rpx;
+  margin-top: 30rpx;
+  padding: 0 44rpx;
 }
 
 .sub_bar_title {
@@ -145,11 +210,10 @@
   background: #fff;
   padding-bottom: 30rpx;
 }
-
-.fdkz-card {
-  margin: 10rpx 30rpx;
-  height: 520rpx;
-  /* padding: 0 30rpx; */
+.fdkz-card-info-date-more{
+  text-align: center;
+  font-size: 26rpx;
+  padding-bottom: 74rpx;
 }
 
 .fdkz-card:first-child {
@@ -162,12 +226,7 @@
 }
 
 .fdkz-card-img {
-  height: 400rpx;
-}
-
-.fdkz-card-info {
-  height: 170rpx;
-  padding: 20rpx;
+  height: 324rpx;
 }
 
 .tour_map {
@@ -199,20 +258,15 @@
   height: 100%;
 }
 
-.tab-bar {
-  height: 100rpx;
-}
+
 
 .weui-cell__ft_in-access_active:after{
   top:20rpx;
 }
-.fix_weui-cell__ft_in-access{
-  padding-right: 12rpx;
-}
 
 
-.fix_weui-cell__ft_in-access:after{
-}
+
+
 .changguan_title{
   float:right;
   font-size:24rpx;

pages/swkz/index.wxml

@@ -12,7 +12,7 @@
         <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>

pages/swkz/index.wxss

@@ -1,7 +1,4 @@
-/* pages/yuezhan/index.wxss */
-.container{
-  padding: 0;
-}
+/* pages/yuezhan/index.wxss */ 
 .nav-con{
   position: fixed;
   left: 0;

pages/yuezhan/index.wxss

@@ -3,6 +3,7 @@
 .container {
   padding: 0;
   margin-top: 130rpx;
+  background: #F5F5F5;
 }
 
 .nav-con {
@@ -17,8 +18,8 @@
 
 .yuezhan-navbar {
   display: flex;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  border-bottom: 2rpx solid #ddd;
+  /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-bottom: 2rpx solid #ddd; */
   color: #999;
   background: #fff;
   height: 130rpx;

pages/yuezhan/search_result/index.js

@@ -1,7 +1,7 @@
 // pages/yuezhan/search/index.js
 const { request, serverName } = require('../../../utils/services');
 const { Toast } = require('../../../utils/util');
-const { defaultImg, noExhibitionImg } = require('../../../utils/images');
+const { defaultImg, noExhibitionImg, noExhibitionHallImg } = require('../../../utils/images');
 
 const app = getApp();
 
@@ -49,6 +49,7 @@ Page({
     this.setData({
       animationData: animation.export(),
       noExhibitionImg,
+      noExhibitionHallImg,
       defaultImg
     })
     console.log(options.searchText);

pages/yuezhan/search_result/index.wxml

@@ -166,7 +166,7 @@
         <view class="weui-loadmore__tips">正在加载</view>
       </view>
       <view class='noDataClass' hidden='{{pavilionList.length>0}}'>
-        <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionImg}}'></image>
+        <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionHallImg}}'></image>
         <view class="tips">
           没有搜到对应的展馆
         </view>

pages/zl_detail/index.js

@@ -353,6 +353,7 @@ Page({
       WxParse.wxParse('openTime', 'html', openTime, this, 5);
       
       console.log(this.data._show_star)
+      console.log(exhibitionDetail)
     })
   },
 

pages/zl_detail/index.wxml

@@ -39,12 +39,13 @@
     </view>
     <view class="">
       <navigator hover-class='none' url="{{'../cg_detail/index?id='+exhibitionDetail.pavilions[0].id}}" class="weui-cell weui-cell_access" style='margin-bottom:20rpx;'>
+      {{exhibitionDetail.pavilions[0].id}}
         <view class="weui-media-box__hd">
           <image class='weui-media-box__hd_avatar' mode='aspectFill' src="{{exhibitionDetail.pavilions[0].logoUrl||defaultImg}}"></image>
         </view>
         <view class="weui-cell__bd">
           <view class="weui-media-box__title">
-            <view class="weui-flex__item detail_title">{{exhibitionDetail.pavilions[0].name}}</view>
+            <view class="weui-flex__item detail_title"></view>
           </view>
         </view>
         <view class="weui-cell__ft weui-cell__ft_in-access"></view>

project.config.json

@@ -31,7 +31,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,
@@ -46,10 +46,11 @@
 					"query": ""
 				},
 				{
-					"id": -1,
+					"id": 2,
 					"name": "detail",
 					"pathName": "pages/zl_detail/index",
-					"query": ""
+					"query": "id=5623",
+					"scene": null
 				},
 				{
 					"id": -1,
@@ -70,10 +71,11 @@
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "test",
-					"pathName": "pages/yuezhan/search/index",
-					"query": ""
+					"id": 7,
+					"name": "cg_detail",
+					"pathName": "pages/cg_detail/index",
+					"query": "id=14098",
+					"scene": null
 				}
 			]
 		}