2.1.2版本

pages/cg_detail/index.js

@@ -11,10 +11,6 @@ Page({
    */
   data: {
     readActive:false,
-    testImg: '../../imgs/testImg/fdkz.png',
-    avatar: '../../imgs/testImg/1.jpg',
-    icon_quanping:'../../imgs/quanping.png',
-    animationData: {},
     active: false,
     isLike: false,
     imgServer,
@@ -34,39 +30,12 @@ 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) { },
-  //   })
-  // },
-
   readMore: function () {
     let readActive= !this.data.readActive,
       relatedActivities = this.data.pavilionDetail.relatedActivities,
       pavilionDetail = this.data.pavilionDetail,
       fullRelatedActivities = this.data.relatedActivities;
     
-    // 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;
-    // }
-
-    
     this.setData({
       readActive:true,
       pavilionDetail
@@ -83,20 +52,6 @@ Page({
       serverName,
       defaultImg
     })
-    this.getPavilionDetail();
-    var animation = wx.createAnimation({
-      duration: 400,
-      timingFunction: 'ease-in-out',
-    })
-
-    this.animation = animation
-
-    animation.scale(1.5, 1.5).step();
-    animation.scale(1, 1).step();
-
-    this.setData({
-      animationData: animation
-    })
   },
   addLike: function () {
     if (this.data.isLike) {
@@ -147,13 +102,9 @@ Page({
       });
       WxParse.wxParse('description', 'html', description, this, 5);
       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
     })
@@ -172,40 +123,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    let { city, clickToSelect, collectedArr, collectedChange } = app.globalData;
-    console.log(this.data.relatedActivities)
-    let { relatedActivities } = this.data;
-    // let { relatedActivities } = pavilionDetail
-
-  
-    if (collectedChange) {
-      for (let i = 0; i < relatedActivities.length; i++) {
-        for (let j = 0; j < collectedArr.length; j++) {
-          if (collectedArr[j].collectedId == relatedActivities[i].id) {
-            relatedActivities[i].hasCollect = collectedArr[j].status
-            if (relatedActivities[i].hasCollect) {
-              relatedActivities[i].collectionsCount += 1;
-            }
-            else {
-              relatedActivities[i].collectionsCount -= 1;
-            }
-            if (relatedActivities[i].collectionsCount < 0) {
-              relatedActivities[i].collectionsCount = 0
-            }
-          }
-        }
-        // console.log(collectedArr.status, collectedArr.collectedId)
-
-      }
-      this.setData({
-        relatedActivities
-      })
-    }
-    app.globalData.clickToSelect = false;
-    // app.globalData.collectedChange = false;
-
-
-
+    this.getPavilionDetail();
   },
 
   /**

pages/cg_detail/index.wxml

@@ -3,25 +3,25 @@
 
 <view class='container'>
   <view class='scene-introduction'>
-      <view class='cg_detail_bg'>
-        <image class='cg_detail_bg_img' mode="aspectFill" src="{{imgServer + 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_img_flex'>
-            <image class='cg_detail_info_top_flex_img' mode='aspectFill' src="{{imgServer + pavilionDetail.logoUrl||defaultImg}}"></image>
+    <view class='cg_detail_bg'>
+      <image wx:if="{{pavilionDetail.imageUrl}}" class='cg_detail_bg_img' mode="aspectFill" src="{{(imgServer + 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_img_flex'>
+          <image wx:if="{{pavilionDetail.logoUrl}}" class='cg_detail_info_top_flex_img' mode='aspectFill' src="{{imgServer + 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_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='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 class="cg_detail_container">
           <view style='height:190rpx;overflow:hidden'>
           <template is="wxParse" data="{{wxParseData:description.nodes}}" />
           </view>
@@ -34,49 +34,52 @@
           </view>
         </view> -->
 
-        <view class='cg_detail_warpper'>
-          <view class='cg_detail_time_warpper'>
-            <view class='iconfont iconshijian' ></view>
-            <text class='cg_detail_time'>{{pavilionDetail.openTime}} 提前一个小时入馆 周一闭馆</text>
-          </view>
-          <navigator class='cg_address_warpper' url="./cg_introduce/index?id={{pavilionId}}">
-            <view class=' iconfont iconweizhi'></view>
-            <text class='cg_address'>{{pavilionDetail.address}}</text>
-            <view class='iconfont icon-youbian'></view>
-          </navigator>
+      <view class='cg_detail_warpper'>
+        <view class='cg_detail_time_warpper'>
+          <view class='iconfont iconshijian'></view>
+          <text class='cg_detail_time'>{{pavilionDetail.openTime}} 提前一个小时入馆 周一闭馆</text>
+        </view>
+        <navigator class='cg_address_warpper' url="./cg_introduce/index?id={{pavilionId}}">
+          <view class=' iconfont iconweizhi'></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_title'>展厅简介</view>
 
-          <view class='cg_detail_desc'>
-            <view class='cg_detail_desc_con {{ pavilionDetail.description ? "" : "noText"  }} {{active ? "active" : ""}}'  >
-              <template is="wxParse" data="{{wxParseData:description.nodes}}" />
-              <text wx:if="{{!pavilionDetail.description}}" >暂无简介</text>
-            </view>
-            <view wx:if="{{pavilionDetail.description}}" class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell' >{{active ? "" : "查看更多内容" }}</view>
+        <view class='cg_detail_desc'>
+          <view class='cg_detail_desc_con {{ pavilionDetail.description ? "" : "noText"  }} {{active ? "active" : ""}}'>
+            <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+            <text wx:if="{{!pavilionDetail.description}}">暂无简介</text>
           </view>
-
+          <view wx:if="{{pavilionDetail.description}}" class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell'>{{active ? "" : "查看更多内容" }}</view>
         </view>
+
       </view>
+    </view>
   </view>
 
   <view class='cg_artist' wx:if="{{pavilionDetail.relatedActivities.length}}">
-    <view class='fdkk-cells' >
+    <view class='fdkk-cells'>
       <view class='tab-bar'>
-        <view class='weui-cell' >
+        <view class='weui-cell'>
           <view class='weui-cell__bd'>
             <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  class="weui-cell__ft   fix_weui-cell__ft_in-access " >全部（{{relatedActivitiesLength}}）</view>
+          <view class="weui-cell__ft   fix_weui-cell__ft_in-access ">全部（{{relatedActivitiesLength}}）</view>
         </view>
       </view>
       <view class='artist_avatar'>
-        <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'> -->
+        <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">
           <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 wx:if="{{item.statusText}}" class="{{item.online == 1 ? 'new-fdkz-card-tag' : 'fdkz-card-tag'}}  {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag-end':item.statusText=='热门'?'':'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'>
@@ -84,55 +87,18 @@
               <view class='title-txt'>
                 {{item.name}}
               </view>
-              <!-- <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}}</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> --> 
+              
               <view>{{item.statusTextDesp}}</view>
             </view>
           </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='fdkk-cells' style='padding: 0;margin-bottom:0'>
-      <view class='weui-cell fix-padding'>
-        <view class='weui-cell__bd' style='padding:0 30rpx;'>
-          <text class='sub_bar_title'>参观指南</text>
-        </view>
-      </view>
-      <cover-view class='tour_map' wx:if="{{pavilionDetail.relatedActivities[0].longitude}}">
-        <map id="map" longitude="{{pavilionDetail.relatedActivities[0].longitude}}" latitude="{{pavilionDetail.relatedActivities[0].latitude}}" scale="14" controls="{{controls}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" polyline="{{polyline}}"
-          bindregionchange="regionchange" show-location style="width: 100%; height: 400rpx;">
-          <cover-image src='{{icon_quanping}}' bindtap='navigateToLocation' class='icon_quanping'></cover-image>
-        </map>
-      </cover-view>
-      <view style='padding-bottom:30rpx;'>
-        <view wx:key="index" class='tour_info' wx:if="{{pavilionDetail.address}}">
-          <view class='tour_info_title'>地址：</view>
-          <view class='tour_info_txt'>{{pavilionDetail.address}}</view>
-        </view>
-        <view wx:key="index" class='tour_info' wx:if="{{pavilionDetail.openTime}}">
-          <view class='tour_info_title'>开放时间</view>
-          <view class='tour_info_txt'>
-            <template is="wxParse" data="{{wxParseData:openTime.nodes}}" />
-          </view>
-        </view>
-        <view wx:key="index" class='tour_info' wx:if="{{pavilionDetail.tel}}">
-          <view class='tour_info_title'>电话</view>
-          <view class='tour_info_txt'>{{pavilionDetail.tel}}</view>
-        </view>
+      <view class='fdkz-card-info-date-more' bindtap='readMore'>{{(readActive || relatedActivitiesLength
+        < 3) ? "没有更多内容" : "查看更多内容" }}</view>
       </view>
     </view>
-  </view> -->
-</view>
+  </view>

pages/cg_detail/index.wxss

@@ -6,6 +6,9 @@
   padding: 0;
   background: #eee;
 }
+.cg_detail_bg{
+  font-size: 0;
+}
 
 .cg_detail_bg_img {
   width: 100%;

pages/user/index.js

@@ -56,7 +56,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    this.isLongPolling()
+    // this.isLongPolling()
   },
 
   isLongPolling: function() {
@@ -98,13 +98,6 @@ Page({
       requestTask
     })
 
-
-    // request["longPolling"]({
-    //   loginSessionKey
-    // }, 'post', res => {
-
-
-    // })
   },
 
   tapByIdx: function(e) {

pages/user/my_comment/index.wxss

@@ -42,6 +42,7 @@
   color: #000;
   font-size: 28rpx;
   margin: 30rpx 0 46rpx 0;
+  word-break: break-all;
 }
 .comment_exhibition{
   display: flex;

pages/user/my_follow/index.js

@@ -24,19 +24,21 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getCollectedExhibitions()
-    var animation = wx.createAnimation({
-      duration: 400,
-      timingFunction: 'ease-in-out',
-    })
 
-    this.animation = animation
-
-    animation.scale(1.5, 1.5).step();
-    animation.scale(1, 1).step();
+    wx.getLocation({
+      type: 'wgs84',
+      success: (res) => {
+        this.setData({
+          latitude: res.latitude||0,
+          longitude: res.longitude||0
+        })
+      },
+      complete:()=>{
+        this.getCollectedExhibitions()
+      }
+    })
 
     this.setData({
-      animationData: animation.export(),
       serverName,
       defaultImg,
       noExhibitionImg
@@ -165,7 +167,11 @@ Page({
 
   getCollectedExhibitions:function(){
     let loginSessionKey = wx.getStorageSync("token")||"";
+    let { latitude: lat, longitude: lng } = this.data;
+
     request["collectExhibitions"]({
+      lat,
+      lng,
       loginSessionKey
     },"",res=>{
       if(res.data.code>-1){

pages/user/my_saw/index.js

@@ -34,7 +34,19 @@ Page({
       noExhibitionImg,
       defaultImg
     })
-    this.getBrowsedExhibitions()
+    wx.getLocation({
+      type:'wgs84',
+      success: (res)=> {
+        this.setData({
+          latitude:res.latitude||0,
+          longitude:res.longitude||0
+        })
+      },
+      complete:()=>{
+        this.getBrowsedExhibitions()
+      }
+    })
+
   },
   onPullDownRefresh: function() {
     this.setData({
@@ -98,8 +110,11 @@ Page({
     } else {
       return
     }
+    let {latitude:lat,longitude:lng} = this.data
     request["getExhibitionsByIds"]({
         ids,
+        lat,
+        lng,
         loginSessionKey
       }, "", res => {
         if (res.data.code > -1) {

pages/wv_page/index.js

@@ -17,9 +17,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let dom = wx.createSelectorQuery().select('#wv')
-    console.log('asdasdasd', dom)
-    
     recordAccess(options)
     console.log(options)
     let { link: url, imageUrl,id:sceneId } = options;

pages/wv_page/index.json

@@ -1 +1,3 @@
-{}
+{
+  "pageOrientation": "auto"
+}

pages/wv_page/index.wxml

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

pages/wv_page/index.wxss

@@ -1 +1 @@
-/* pages/wv_page/index.wxss */
+/* pages/wv_page/index.wxss */

pages/yuezhan/index.wxml

@@ -25,7 +25,7 @@
       <view class='fdkz-card-img'>
 
         <view wx:if="{{item.statusText}}" 
-        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'}}">
+        class="{{item.online == 1 ? 'new-fdkz-card-tag' : 'fdkz-card-tag'}}  {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag-end':item.statusText=='热门'?'':'fdkz-card-tag_coming'}}">
           <text class='fdkz-card-tag-txt'>{{item.online == 1 ? '线上看展' : item.statusText}}</text>
         </view>
 

pages/yuezhan/search_result/index.js

@@ -34,29 +34,26 @@ Page({
       serverName,
       imgServer
     });
-    this.loadData();
-    this.getKeywordCode()
-    
-    var animation = wx.createAnimation({
-      duration: 400,
-      timingFunction: 'ease-in-out',
+    wx.getLocation({
+      type: 'wgs84',
+      success: (res) => {
+        this.setData({
+          latitude: res.latitude||0,
+          longitude: res.longitude||0
+        })
+      },
+      complete:()=>{
+        this.loadData()
+      }
     })
-
-    this.animation = animation
-
-    animation.scale(1.5, 1.5).step();
-    animation.scale(1, 1).step();
-
+    // this.getKeywordCode()
+    
     this.setData({
-      animationData: animation.export(),
       noExhibitionImg,
       noExhibitionHallImg,
       defaultImg
     })
-    console.log(options.searchText);
-    this.setData({
 
-    })
   },
 
   keywordSearch:function(e){
@@ -165,8 +162,12 @@ Page({
     this.setData({
       loading: true
     })
+    let { latitude: lat, longitude: lng } = this.data;
+
     request["getExhibitionSearch"]({
       name,
+      lat,
+      lng,
       page
     },"",res=>{
       if(res.data.code>-1){
@@ -203,8 +204,12 @@ Page({
     this.setData({
       loading: true
     })
+    let { latitude: lat, longitude: lng } = this.data;
+
     request["getPavilionSearch"]({
       name,
+      lat,
+      lng,
       page
     }, "", res => {
       if (res.data.code > -1) {
@@ -270,16 +275,8 @@ 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,
@@ -287,9 +284,8 @@ Page({
       this.setData({
         ExhibitionPopular: res.data.data
       })
-      console.log(this.data.ExhibitionPopular)
     }, err => {
-        
+
     }, complete => {
 
     })

pages/yuezhan/search_result/index.wxml

@@ -57,7 +57,7 @@
                     <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>
+                      <text>{{item.hasProduct?item.pv:(item.distance || 0) +' km'}}</text>
                     </view>
                   </view>
                 </view>
@@ -91,7 +91,7 @@
     <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'>
-          <view class="fdkk-cells" style='margin-bottom:0;border-bottom: 2rpx solid #efefef;'>
+          <view class="fdkk-cells" style='margin-bottom:0;'>
             <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">
@@ -152,7 +152,7 @@
                         <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>
+                          <text>{{item.hasProduct?item.pv:(item.distance || 0 )+' km'}}</text>
                         </view>
                       </view>
                     </view>

pages/zl_detail/index.js

@@ -141,7 +141,6 @@ Page({
       type: Number(type),
     }, "post", res => {
       if (res.data.code > -1) {
-        console.log("asdw", comments.content[idx].hasLike)
         comments.content[idx].hasLike = res.data.data.hasLike
         if (res.data.data.hasLike) {
           comments.content[idx].likeCount += 1;
@@ -298,21 +297,11 @@ Page({
         cookieIDs = removeArrItem(cookieIDs, cookieIDs[i])
       }
     }
-
-    console.log((typeof (Number(id))))
-
     if (hasItem && id != undefined && (typeof(Number(id)) == 'number')) {
       cookieIDs.unshift(id)
     }
 
-    console.log(id)
-    console.log(cookieIDs)
-    
-
     app.globalData.cookieIDs = cookieIDs
-
-
-    console.log(app.globalData.cookieIDs)
  
   },
 
@@ -325,7 +314,7 @@ Page({
       let { description, openTime, comments } = exhibitionDetail;
       let _show_star = this.fix_starImg(exhibitionDetail.score || '0.0');
       if (comments) {
-        let commentsCon = comments.content;
+        let commentsCon = comments;
         for (let i = 0; i < commentsCon.length; i++) {
           let comments_star = this.fix_starImg(commentsCon[i].score || '0.0')
           commentsCon[i]['imgObj'] = comments_star
@@ -360,8 +349,7 @@ Page({
       WxParse.wxParse('description', 'html', description, this, 5);
       WxParse.wxParse('openTime', 'html', openTime, this, 5);
       
-      console.log(this.data._show_star)
-      console.log(exhibitionDetail)
+
     })
   },
 

pages/zl_detail/index.wxml

@@ -37,15 +37,15 @@
     </navigator>
 
     <view class='cg_detail_desc'>
-      <view class='cg_detail_desc_con {{ exhibitionDetail.description ? "" : "noText"  }} '  >
+      <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>
+        <text wx:if="{{!exhibitionDetail.description}}">暂无简介</text>
       </view>
-      <view wx:if="{{exhibitionDetail.description}}" class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell' >{{active ? "" : "查看更多内容" }}</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}}">
 
@@ -55,7 +55,7 @@
           <image class='artist_avatar_img' mode='aspectFill' src="{{ imgServer + exhibitionDetail.pavilions[0].logoUrl||defaultImg}}"></image>
           <view class='pav_item'>
             <view class='pav_name'>{{exhibitionDetail.pavilions[0].name}}</view>
-            <view class='cg_desc'>在展{{exhibitionDetail.pavilions.length||0}}场</view>
+            <view class='cg_desc'>在展{{exhibitionDetail.pavilions[0].relatedActivitiesSize||0}}场</view>
           </view>
         </view>
         <text class='iconfont iconkedianjibiaoshiicon'></text>
@@ -71,7 +71,26 @@
           <text bindtap='tapToComement' class='write_comment'>写评论</text>
         </view>
       </view>
-      <view wx:for="{{comments.content}}" wx:if="{{!(index>10)||readActive}}" wx:key="index" class='comment_con'>
+      <view wx:for="{{comments}}" wx:if="{{!(index>10)||readActive}}" wx:key="index" class='comments_con'>
+        <view class='comments-item'>
+          <view class='item-top'>
+            <view class='top-avatar'>
+              <image mode='aspectFill' src="{{item.avatarUrl||defaultImg}}" />
+            </view>
+            <view class='top-middle'>
+                <view style='font-size:30rpx;'>{{item.nickName}}</view>
+                <image wx:for="{{item.imgObj}}" wx:key="index" class="comment-img__item" mode='aspectFill' src="{{item.img}}"></image>
+            </view>
+            <view class='top-right'>
+              <text>{{item.dateTimeDeatil}}</text>
+            </view>
+          </view>
+          <view class='item-bottom'>
+              <view class="bottom-detail">{{item.comment}}</view>
+          </view>
+        </view>
+      </view>
+      <!-- <view wx:for="{{comments}}" 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">
@@ -79,32 +98,24 @@
             </view>
           </view>
           <view class="weui-cell__bd">
-          <view class='comment-left'>
-          <view class="comment-username">
-              <text style='font-size:30rpx;'>{{item.nickName}}</text>
-
-            </view>
-            <view>
-              <image wx:for="{{item.imgObj}}" wx:key="index" class="comment-img__item" mode='aspectFill' src="{{item.img}}"></image>
-            </view>
-            <view class="comment-detail">
-              <text style='font-size:28rpx;'>{{item.comment}}</text>
-              <!-- <template is="wxParse" data="{{wxParseData:content.nodes}}" /> -->
-
-            </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 class='comment-left'>
+              <view class="comment-username">
+                <text style='font-size:30rpx;'>{{item.nickName}}</text>
+              </view>
+              <view>
+                <image wx:for="{{item.imgObj}}" wx:key="index" class="comment-img__item" mode='aspectFill' src="{{item.img}}"></image>
+              </view>
+              <view class="comment-detail">{{item.comment}}</view>
+              <view class="comment-dec " bindtap='addCommentLike' data-idx="{{index}}" data-type="{{item.hasLike}}" data-id="{{item.id}}">
+              </view>
             </view>
             <view class='comment-right'>
               <text>{{item.dateTimeDeatil}}</text>
             </view>
           </view>
         </view>
-      </view>
-      <!-- <view class='shensuo' bindtap="{{comments.content.length>0?'tapToCommentDetail':''}}"> -->
-      <view class='shensuo' wx:if="{{comments.content.length >= 10}}" bindtap="readMore" >
+      </view> -->
+      <view class='shensuo' wx:if="{{comments.length >= 10}}" bindtap="readMore">
         <text class="">{{readActive ? "" : "查看更多内容" }}</text>
       </view>
     </view>

pages/zl_detail/index.wxss

@@ -336,7 +336,9 @@
   font-size: 28rpx;
   font-weight: bold;
 }
-
+.comment-left{
+  flex: 1;
+}
 .comment-right{
   flex: 1;
   text-align: right;
@@ -346,10 +348,8 @@
 .comment-detail{
   color: #646464;
   font-size: 26rpx;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  width: 350rpx;
+  max-width: 516rpx;
+  word-wrap:break-word;
 }
 
 .cg_detail_desc{
@@ -376,3 +376,44 @@
 .cg_detail_descMore.active{
   margin-top:0;
 }
+
+.comments_con{
+  padding: 20rpx 30rpx;
+}
+
+.comments-item{
+  display: flex;
+  flex-direction: column;
+}
+.item-top{
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  width: 100%;
+}
+.top-right{
+  flex: 1;
+  text-align: right;
+  font-size:26rpx;
+  color: #646464;
+}
+.top-avatar image{
+  width:82rpx;
+  height:82rpx;
+  border-radius:50%;
+  overflow:hidden;
+  margin-right: 30rpx;
+}
+.top-middle{
+  flex: 5;
+}
+.item-bottom{
+  width: 100%;
+}
+.bottom-detail{
+  width: 78%;
+  margin-left:112rpx;
+  word-wrap:break-word;
+  font-size:26rpx;
+  color: #646464;
+}

project.config.json

@@ -32,7 +32,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 12,
+			"current": 13,
 			"list": [
 				{
 					"id": 0,
@@ -70,8 +70,8 @@
 				{
 					"id": 5,
 					"name": "test",
-					"pathName": "pages/tongcheng/index",
-					"query": "",
+					"pathName": "pages/zl_detail/index",
+					"query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
 					"scene": null
 				},
 				{
@@ -122,6 +122,13 @@
 					"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
+				},
+				{
+					"id": 13,
+					"name": "test",
+					"pathName": "pages/wv_page/index",
+					"query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+					"scene": 1091
 				}
 			]
 		}

utils/services.js

@@ -2,8 +2,8 @@ const {
   Toast
 } = require('./util');
 
-//const serverName = 'https://www.4dmuseum.cn'; // 正式
-const serverName = 'http://192.168.0.177:8081'; // 本地
+const serverName = 'https://www.4dmuseum.cn/2.0'; // 正式
+// const serverName = 'http://192.168.0.177:8081'; // 本地
 
 //const imgServer = 'https://www.4dmuseum.cn/'
 const imgServer = ''