commit in 3.28

app.js

@@ -97,7 +97,7 @@ App({
     })
   },
 
-
+  //应用关闭的函数
   onHide: function () {
     let {
       cookieIDs
@@ -111,7 +111,7 @@ App({
      ids = cookieIDs.join(",") || undefined;
     }
     let loginSessionKey = wx.getStorageSync("token") || "";
-
+    //关闭应用的时候发送你浏览过的场景
     if (loginSessionKey) {
       wx.request({
         url: serverName + '/wx/api/user/saveBrowsedExhibitions',

app.json

@@ -24,7 +24,8 @@
     "pages/yuezhan/pay_page/rule_detail/index",
     "pages/login_page/index",
     "common/components/drop-down/index",
-    "pages/user/my_contact/index"
+    "pages/user/my_contact/index",
+    "common/components/component-list/component-list"
   ],
   "window": {
     "backgroundTextStyle": "dark",
@@ -34,7 +35,9 @@
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
-    "selectedColor": "#353535",
+    "color": "#B2B2B2",
+    "selectedColor": "#000",
+    "borderStyle": "black",
     "list": [
       {
         "pagePath": "pages/yuezhan/index",

app.wxss

@@ -58,7 +58,7 @@ html, body, page {
 }
 
 .fdkz-card-tag {
-  line-height: 36rpx;
+  line-height: 40rpx;
   position: absolute;
   width: 92rpx;
   height: 36rpx;
@@ -73,7 +73,7 @@ html, body, page {
 }
 
 .fdkz-card-tag_offline{
-  background: #fff;
+  background: #E02F2F;
 }
 
 .fdkz-card-tag_coming{
@@ -81,11 +81,11 @@ html, body, page {
   
 }
 .fdkz-card-tag_finish{
-  background: #666;
+  background: #E02F2F;
 }
 
 .fdkz-card-tag_offline .fdkz-card-tag-txt{
-  color: #e02f2f
+  color: #fff;
 }
 .fdkz-card-tag-txt {
   color: #fff;
@@ -373,7 +373,6 @@ html, body, page {
 }
 
 .comment-dec {
-  margin-top: 10rpx;
   color: #999;
   font-size: 24rpx;
 }

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

@@ -0,0 +1,76 @@
+// components/component-list.js
+const { imgServer } = require('../../../utils/services.js')
+const app = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    hasProduct: {
+      type: Boolean
+    },
+    hasPay: {
+      type: Boolean
+    },
+    sceneId: {
+      type: String
+    },
+    imageUrl: {
+      type: String
+    },
+    name: {
+      type: String
+    },
+    pavilionName: {
+      type: String
+    },
+    statusTextDesp: {
+      type: String
+    },
+    distance: {
+      type: String
+    },
+    online: Number,
+    scenePv: Number,
+    link: String
+  },
+  options: {
+    addGlobalClass: true,
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    imgServer
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    goBigScene: function(){
+      if (this.data.hasProduct){
+        app.globalData.currentUrl = this.data.link
+        wx.navigateTo({
+          url: `../../wv_page/index?link=${escape(this.data.link)}`,
+          success: function (res) { },
+          fail: function (res) { },
+          complete: function (res) { },
+        })
+      }else{
+        wx.navigateTo({
+          url: `../../zl_detail/index?id=${this.data.sceneId}`,
+          success: function (res) { },
+          fail: function (res) { },
+          complete: function (res) { },
+        })
+      }
+      
+    }
+    
+  },
+  ready : function(){
+    console.log(this.data)
+  }
+})

common/components/component-list/component-list.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

common/components/component-list/component-list.wxml

@@ -0,0 +1,42 @@
+<!-- 组件模板 -->
+<view class="wrapper">
+    <!-- <navigator hover-class='none' url="{{hasProduct&&!hasPay?('../../../pages/yuezhan/pay_page/index?id='+sceneId):(hasProduct?'../../wv_page/index?id='+sceneId:'../../zl_detail/index?id='+sceneId)}}" class='weui-tab__content_item'> -->
+    <view hover-class='none' bindtap='goBigScene' 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 + 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">{{name}}</text>
+                <view class="pavilionName">
+                  {{pavilionName}}
+                </view>
+              </view>
+              
+              <view class='desc'>
+                <view class="weui-media-box__desc">{{statusTextDesp}}</view>
+
+                <view wx:if="{{online == 0}}">
+                  <view class='iconfont icon-zuobiao'></view>
+                  <text>{{distance || 0 }} km</text>
+                </view>
+
+                <view wx:if="{{online == 1}}">
+                  <view class='iconfont icon-ren111'></view>
+                  <text>{{scenePv}}</text>
+                </view>
+
+              </view>
+            </view>
+            <view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  <slot></slot>
+</view>

common/components/component-list/component-list.wxss

@@ -0,0 +1,94 @@
+/* common/components/component-list/component-list.wxss */
+/* pages/yuezhan/search/index.wxss */
+
+.weui-media-box {
+  padding: 0;
+}
+.weui-tab__panel {
+  padding: 0 44rpx;
+  margin-top: 6rpx;
+  overflow-x: hidden;
+  margin-bottom: 20rpx;
+}
+
+.weui-media-box_appmsg {
+  align-items: flex-start;
+}
+
+.weui-media-box__hd_in-appmsg {
+  width: 240rpx;
+  height: 180rpx;
+  min-width: 240rpx;
+  border-radius: 8rpx;
+  margin-right: 44rpx;
+  overflow: hidden;
+}
+
+.weui-tab__content_item {
+  height: 100%;
+}
+
+.weui-media-box__thumb {
+  position: relative;
+}
+
+
+.weui-flex__item{
+  margin-bottom: 42rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap; 
+  width: 400rpx; 
+  display: inline-block;
+}
+
+
+
+
+
+.weui-media-box__desc {
+  line-height: 1.5;
+  white-space: nowrap;
+  text-overflow:ellipsis;
+  overflow: hidden;
+  display: inline-block;
+}
+
+.weui-media-box__bd_in-appmsg .desc{
+  display: flex;
+  justify-content: space-between;
+  font-weight: normal;
+}
+.weui-media-box__bd_in-appmsg .desc .icon-zuobiao{
+  font-size: 22rpx;
+  display: inline-block;
+  vertical-align: text-bottom;
+  margin-right: 12rpx;
+
+}
+.weui-media-box__bd_in-appmsg .desc .icon-ren111{
+  font-size: 32rpx;
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: 12rpx;
+
+}
+
+.weui-media-box__bd_in-appmsg{
+  height: 185rpx;
+  display: flex;
+  flex-direction: column;
+  font-size: 24rpx;
+  color: #646464;
+  justify-content: space-between;
+}
+.weui-media-box__title{
+  font-size: 32rpx;
+  color: #000;
+  flex-direction: column;
+}
+.weui-media-box__title .pavilionName{
+  font-size: 24rpx;
+  color: #646464;
+}
+

pages/cg_detail/cg_introduce/index.js

@@ -3,12 +3,21 @@ Page({
     latitude: 23.099994,
     longitude: 113.324520,
     markers: [{
-      id: 1,
       latitude: 23.099994,
-      longitude: 113.324520,
-      name: 'T.I.T 创意园'
+      longitude: 113.324520
     }]
   },
+  onLoad: function(options){
+    console.log(options)
+    this.setData({
+      latitude: options.la,
+      longitude: options.lo,
+      markers: [{
+        latitude: options.la,
+        longitude: options.lo
+      }]
+    })
+  },
   onReady: function (e) {
     this.mapCtx = wx.createMapContext('myMap')
   }

pages/cg_detail/index.js

@@ -1,5 +1,5 @@
 // pages/zl_detail/index.js
-const { request, serverName } = require('../../utils/services');
+const { request, serverName, imgServer } = require('../../utils/services');
 const WxParse = require('../../common/component/wxParse/wxParse.js');
 const { defaultImg } = require('../../utils/images');
 const app = getApp();
@@ -17,6 +17,7 @@ Page({
     animationData: {},
     active: false,
     isLike: false,
+    imgServer,
     longitude: 113.324520,
     latitude: 23.099994,
     likeNum:526,

pages/cg_detail/index.wxml

@@ -4,12 +4,12 @@
 <view class='container'>
   <view class='scene-introduction'>
       <view class='cg_detail_bg'>
-        <image class='cg_detail_bg_img' mode="aspectFill" src="{{pavilionDetail.imageUrl||defaultImg}}"></image>
+        <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="{{pavilionDetail.logoUrl||defaultImg}}"></image>
+            <image 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'>
@@ -36,11 +36,11 @@
 
         <view class='cg_detail_warpper'>
           <view class='cg_detail_time_warpper'>
-            <view class='iconfont icon-shijian' ></view>
+            <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 icon-zuobiao'></view>
+            <view class=' iconfont iconweizhi'></view>
             <text class='cg_address'>{{pavilionDetail.address}}</text>
             <view class='iconfont icon-youbian'></view>
           </navigator>
@@ -48,10 +48,11 @@
           <view class='cg_detail_title'>展厅简介</view>
 
           <view class='cg_detail_desc'>
-            <view class='cg_detail_desc_con {{ active ? "active" : ""  }}'  >
+            <view class='cg_detail_desc_con {{ pavilionDetail.description ? "" : "noText"  }}'  >
               <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+              <text wx:if="{{!pavilionDetail.description}}" >暂无简介</text>
             </view>
-            <view class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell' >{{active ? "" : "查看更多内容" }}</view>
+            <view wx:if="{{pavilionDetail.description}}" class='cg_detail_descMore {{ active ? "active" : ""  }}' bindtap='clickCell' >{{active ? "" : "查看更多内容" }}</view>
           </view>
 
         </view>
@@ -76,7 +77,7 @@
             <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>
-            <image src="{{item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
+            <image src="{{imgServer + item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
           </view>
           <view class='fdkz-card-info'>
             <view class='fdkz-card-info-title'>

pages/cg_detail/index.wxss

@@ -67,11 +67,15 @@
   overflow: hidden;
   color: #646464;
   text-align:justify;
+  margin-bottom: 20rpx;
 }
 .cg_detail_desc_con{
   height: 160rpx;
   overflow: hidden;
 }
+.cg_detail_desc_con.noText{
+  height: auto;
+}
 .cg_detail_desc_con.active{
   height: auto;
 }

pages/swkz/index.js

@@ -1,5 +1,5 @@
 //index.js
-const { request, serverName } = require('../../utils/services');
+const { request, serverName, imgServer } = require('../../utils/services');
 const { Toast } = require('../../utils/util.js');
 const { defaultImg, noExhibitionImg } = require('../../utils/images');
 
@@ -13,6 +13,7 @@ Page({
     animationData: {},
     loading: false,
     isLike: true,
+    imgServer,
     commodityImgs: [],
     testImg: '../../imgs/testImg/fdkz.png',
     currentPage: 1,

pages/swkz/index.wxml

@@ -5,7 +5,7 @@
       <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>
-      <image src="{{item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
+      <image src="{{ imgServer + item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
     </view>
     <view class='fdkz-card-info'>
       <view class='fdkz-card-info-title'>

pages/user/my_comment/index.js

@@ -1,11 +1,13 @@
 // pages/user/my_comment/index.js
 const {
   request,
-  serverName
+  serverName,
+  imgServer
 } = require('../../../utils/services');
 const {
   defaultImg,
-  noExhibitionImg
+  noExhibitionImg,
+  noCollectionImg
 } = require('../../../utils/images');
 
 const {
@@ -24,6 +26,7 @@ Page({
     full_star_img: "../../../imgs/icon/full.png",
     empty_star_img: "../../../imgs/icon/empty.png",
     half_star_img: "../../../imgs/icon/half.png",
+    imgServer
   },
 
   tapTodetail: function(e) {
@@ -115,7 +118,8 @@ Page({
     this.setData({
       serverName,
       noExhibitionImg,
-      defaultImg
+      defaultImg,
+      noCollectionImg 
     })
     this.getComment(1)
   },

pages/user/my_comment/index.wxml

@@ -1,12 +1,7 @@
 <!--pages/user/my_comment/index.wxml-->
 <view class='container'>
   <view class='comment_body'>
-    <view class='nav_bar'>
-      <view class='nav_bar_txt'>已评论</view>
-      <view class='nav_bar_icon'>
-        <text class='iconfont icon-search'></text>
-      </view>
-    </view>
+    
     <view class='comment_con'>
       <view class="weui-tab__panel">
         <view class="weui-tab__content">
@@ -14,39 +9,39 @@
             <view data-id='{{item.exhibition.id}}' data-product="{{item.exhibition.hasProduct}}" bindtap='tapTodetail' class='weui-tab__content_item'>
               <view class="fdkk-cells">
                 <view class="weui-cell">
-                  <view class="weui-cell__hd">
-                    <image class='comment_avatar' mode='aspectFill' src='{{item.avatarUrl||defaultImg}}'></image>
-                  </view>
-                  <view class="weui-cell__bd">
-                    <view class='comment_name'>{{item.nickName}}</view>
-                    <view class='comment_time'>点评了展览</view>
-                  </view>
-                  <view class="weui-cell__ft">
+                  <view class='comment-user'>
+                    <view class="weui-cell__hd">
+                      <image class='comment_avatar' mode='aspectFill' src='{{ item.avatarUrl||defaultImg}}'></image>
+                    </view>
+                    <view class="weui-cell__bd">
+                      <view class='comment_name'>{{item.nickName}}</view>
+                      <view class='comment_time'>点评了展览</view>
+                    </view>
                   </view>
+                  <view class="weui-cell__ft">{{item.dateTimeDeatil}}</view>
                 </view>
                 <view class="weui-panel__bd">
                   <view class="weui-media-box weui-media-box_appmsg">
                     <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
                       <view class="weui-media-box__title weui-flex">
-                        <!-- <view class="weui-flex__item title-txt">{{item.orderItems[0].productName}}</view> -->
                       </view>
                       <view class="comment_content">
                         {{item.comment}}
                       </view>
                       <view class="comment_exhibition">
-                        <image class='comment_image' src="{{item.exhibition.imageUrl||defaultImg}}" mode='aspectFill'></image>
+                        <view class='comment_image_warpper'>
+                          <image class='comment_image' src="{{ imgServer + item.exhibition.imageUrl||defaultImg}}"  mode='aspectFill'                           ></image>
+                        </view>
                         <view class='comment_exhibition_info'>
                           <view class='comment_exhibition_info_title'>{{item.exhibition.name}}</view>
                           <view class='comment_exhibition_info_txt'>{{item.exhibition.pavilionName}}</view>
-                          <view style='display:flex;align-items: center'>
+                          <view style='display:flex;align-items: center; flex: 1;'>
                             <image wx:for="{{item.imgObj}}" wx:key="index" class="comment-img__item" mode='aspectFill' src="{{item.img}}"></image>
-                            <text class='soreSty'>{{item.exhibition.score||'0.0'}}</text>
                           </view>
                         </view>
                       </view>
                       <view class="comment-dec " bindtap='' data-idx="{{index}}" data-type="{{item.hasLike}}" data-id="{{item.id}}">
-                        <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>
@@ -64,10 +59,10 @@
     <view class="weui-loading"></view>
     <view class="weui-loadmore__tips">正在加载</view>
   </view>
-       <view class='noDataClass' hidden='{{myComment.length>0||loading}}'>
-      <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionImg}}'></image>
-      <view class="tips">
-        暂无评论信息
-      </view>
-    </view> 
+    
+    <view class='noCollection' wx:if="{{myComment.length < 1}}" >
+      {{myBrowsed.length}}
+      <image src='{{noCollectionImg}}'></image>
+      <text>没有更多的记录</text>
+    </view>
 </view>

pages/user/my_comment/index.wxss

@@ -1,7 +1,8 @@
 /* pages/user/my_comment/index.wxss */
 .container{
-  background: #eee;
   padding: 0;
+  color: #646464;
+  margin-bottom: 80rpx;
 }
 
 
@@ -10,58 +11,83 @@
 }
 
 .comment_avatar {
-  width: 80rpx;
-  height: 80rpx;
+  width: 32rpx;
+  height: 32rpx;
   border-radius: 50%;
 }
 
 .weui-cell {
-  padding: 10rpx 0 0;
+  padding:  0;
 }
-.weui-cell__bd{
-  margin-left: 30rpx;
+.weui-cell__ft{
+  font-size: 24rpx;
+}
+.comment-user{
+  display: flex;
+  align-items: center;
+  flex: 1;
 }
-.comment_name{
-  font-size: 30rpx;
+.weui-cell__bd{
+  display: flex;
+  margin-left: 24rpx;
 }
-.comment_time{
+.comment_name, .comment_time{
   font-size: 24rpx;
-  color: #999;
 }
+
 .weui-media-box{
   padding: 0;
 }
 .comment_content{
-  margin: 20rpx 0;
+  color: #000;
+  font-size: 28rpx;
+  margin: 30rpx 0 46rpx 0;
 }
 .comment_exhibition{
-  background: #eeeeee;
-  height: 150rpx;
   display: flex;
-  /* justify-content: center; */
-  /* align-items: center; */
+  background: #eeeeee;
+  height: 180rpx;
+  padding: 20rpx;
+  border-radius: 8rpx;
+  box-sizing: border-box;
+}
+.comment_image_warpper{
+  width: 186rpx;
+  border-radius: 8rpx;
+  flex-shrink: 0;
+  overflow: hidden;
 }
 .comment_image{
-  width: 150rpx;
-  height: 150rpx;
+  max-width: 100%;
+  max-height: 100%;
+  display: block;
+  box-sizing: border-box;
 }
 .comment_exhibition_info{
-  margin: 14rpx;
+  display: flex;
+  flex-direction: column;
+  margin-left: 48rpx;
 }
 .comment_exhibition_info_title{
   font-weight: bold;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: 350rpx;
+  color: #000;
+
 }
 .comment_exhibition_info_txt{
-  font-size: 22rpx;
-  color: #999;
+  font-size: 24rpx;
+  color: #646464;
 }
 .fdkk-cells{
   background: #fff;
   margin-bottom: 20rpx;
-  padding: 20rpx 0;
+  padding-top: 60rpx ;
 }
 .weui-tab__content_item{
-  padding:0 30rpx;
+  padding:0 44rpx;
   background: #fff;
 }
 .weui-tab__content_item:last-child > .fdkk-cells{
@@ -70,7 +96,6 @@
 .comment-dec{
   display: flex;
   justify-content: space-between;
-  margin-top: 20rpx;
 }
 .icon-zan {
   /* float: right; */
@@ -83,4 +108,26 @@
 .soreSty{
   margin-left: 20rpx;
   
+}
+
+/* 没有收藏 */
+.noCollection{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.noCollection image{
+  width: 450rpx;
+  height: 450rpx;
+  margin: 0 auto;
+  margin-top: 196rpx;
+  margin-bottom: 272rpx;
+}
+.noCollection text{
+  color: #646464;
+  font-size: 32rpx;
+  opacity: 0.9;
 }

pages/user/my_contact/index.js

@@ -1,11 +1,14 @@
 // pages/user/my_contact/index.js
+const {
+  swkzLogo
+} = require('../../../utils/images');
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    swkzLogo
   },
 
   /**

pages/user/my_contact/index.wxml

@@ -1,2 +1,26 @@
 <!--pages/user/my_contact/index.wxml-->
-<text>pages/user/my_contact/index.wxml</text>
+<view class='warpper-joinus'>
+  <view class='logo'>
+    <image src='{{swkzLogo}}'></image>
+  </view>
+  <view class='joinus'>
+    <view class='joinus-title'>联系我们</view>
+    <view>
+      <view class=' iconfont icondianhua'></view>
+      <text>客服电话：4006698025</text>
+    </view>
+    <view>
+      <view class=' iconfont iconyoujian' ></view>
+      <text>客服邮箱：service@4dkankan.com</text>
+    </view>
+    <view>
+      <view class=' iconfont iconweixin' ></view>
+      <text>客服微信：18666146673</text>
+    </view>
+    <view>
+      <view class=' iconfont iconshangwuhezuo' ></view>
+      <text>商务合作：0756-69967966996791</text>
+    </view>
+    
+  </view>
+</view>

pages/user/my_contact/index.wxss

@@ -1 +1,28 @@
-/* pages/user/my_contact/index.wxss */
+/* pages/user/my_contact/index.wxss */
+.warpper-joinus{
+  color: #646464;
+  font-size: 28rpx;
+  padding: 0 62rpx;
+}
+.logo{
+  margin-top: 88rpx;
+  margin-bottom: 190rpx;
+  text-align: center;
+}
+.logo image{
+  width: 250rpx;
+  height: 260rpx;
+}
+.joinus-title{
+  color: #000;
+  margin-bottom: 50rpx;
+  font-weight: bold;
+}
+.joinus view{
+  display: flex;
+  margin-bottom: 32rpx;
+}
+.joinus .iconfont {
+  font-size: 36rpx;
+  margin-right: 50rpx;
+}

pages/user/my_follow/index.js

@@ -1,8 +1,8 @@
-// pages/yuezhan/search/index.js
+ // pages/yuezhan/search/index.js
 const { request, serverName } = require('../../../utils/services');
 const { Toast, removeArrItem } = require('../../../utils/util.js');
 
-const { defaultImg,noExhibitionImg } = require('../../../utils/images');
+const { defaultImg, noExhibitionImg, noCollectionImg } = require('../../../utils/images');
 const app = getApp();
 
 
@@ -13,11 +13,11 @@ Page({
    */
   data: {
     testImg: '../../../imgs/testImg/fdkz.png',
-
     avatar: '../../../imgs/testImg/1.jpg',
     isLike: false,
     likeNum: 526,
-    myCollected:[]
+    myCollected:[],
+    noCollectionImg
   },
 
   /**
@@ -189,6 +189,8 @@ Page({
     })
   },
 
+
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -200,7 +202,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-     let { collectedArr, collectedChange } = app.globalData;
+    let { collectedArr, collectedChange } = app.globalData;
     let {  myCollected } = this.data
     let isLogin = app.globalData.isLogin;
     

pages/user/my_follow/index.json

@@ -1,4 +1,7 @@
 {
   "enablePullDownRefresh": true,
-  "navigationBarTitleText": "我的收藏"
+  "navigationBarTitleText": "我的收藏",
+  "usingComponents": {
+    "component-list":"../../../common/components/component-list/component-list"
+  }
 }

pages/user/my_follow/index.wxml

@@ -1,16 +1,16 @@
 <!--pages/user/my_comment/index.wxml-->
 <view class='container'>
   <view class='comment_body'>
-    <view class='nav_bar'>
+    <!-- <view class='nav_bar'>
       <view class='nav_bar_txt'>收藏</view>
       <view class='nav_bar_icon'>
         <text class='iconfont icon-search'></text>
       </view>
-    </view>
+    </view> -->
     <view class='comment_con'>
       <view class="weui-tab__panel">
         <view class="weui-tab__content">
-          <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="{{myCollected}}" wx:key="index" class='fdkz-card'>
+          <!-- <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="{{myCollected}}" 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>
@@ -24,7 +24,6 @@
                 </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}}丨{{item.statusTextDesp}}</view>
@@ -36,7 +35,22 @@
               </view>
               <text></text>
             </view>
-          </navigator>
+          </navigator> -->
+          <block wx:for="{{myCollected}}" wx:key="index">
+            <component-list
+              hasProduct="{{item.hasProduct}}"
+              hasPay="{{item.hasPay}}"
+              sceneId="{{item.id}}"
+              imageUrl="{{item.imageUrl}}"
+              name="{{item.name}}"
+              pavilionName="{{item.pavilionName}}"
+              statusTextDesp="{{item.statusTextDesp}}"
+              distance="{{item.distance}}"
+              online="{{item.online}}"
+              scenePv="{{item.pv}}"
+              link="{{item.product.showLink}}"
+            ></component-list>
+          </block>
         </view>
       </view>
     </view>
@@ -46,6 +60,11 @@
         暂无收藏信息
       </view>
     </view> -->
+    <view class='noCollection' wx:if="{{myCollected.length < 1}}" >
+      {{myBrowsed.length}}
+      <image src='{{noCollectionImg}}'></image>
+      <text>没有更多的记录</text>
+    </view>
   </view>
 
 </view>

pages/user/my_follow/index.wxss

@@ -1,11 +1,7 @@
 /* pages/user/my_saw/index.wxss */
 .container{
   padding: 0;
-}
-.saw_body{
-}
-.saw_con {
-
+  margin-bottom: 80rpx;
 }
 
 .weui-tab__panel {
@@ -80,4 +76,26 @@
 }
 .icon-like{
   color: #E02F2F;
+}
+
+/* 没有收藏 */
+.noCollection{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.noCollection image{
+  width: 450rpx;
+  height: 450rpx;
+  margin: 0 auto;
+  margin-top: 196rpx;
+  margin-bottom: 272rpx;
+}
+.noCollection text{
+  color: #646464;
+  font-size: 32rpx;
+  opacity: 0.9;
 }

pages/user/my_saw/index.js

@@ -1,4 +1,5 @@
 // pages/user/my_comment/index.js
+const { noCollectionImg } = require('../../../utils/images');
 const {
   request,
   serverName
@@ -20,7 +21,8 @@ Page({
    */
   data: {
     testImg: '../../../imgs/testImg/fdkz.png',
-    myBrowsed: []
+    myBrowsed: [],
+    noCollectionImg
   },
 
   /**

pages/user/my_saw/index.json

@@ -1,4 +1,7 @@
 {
       "enablePullDownRefresh": true,
-    "navigationBarTitleText": "我的浏览"
+    "navigationBarTitleText": "我的足迹",
+    "usingComponents": {
+      "component-list": "../../../common/components/component-list/component-list"
+    }
 }

pages/user/my_saw/index.wxml

@@ -1,16 +1,16 @@
 <!--pages/user/my_comment/index.wxml-->
 <view class='container'>
   <view class='comment_body'>
-    <view class='nav_bar'>
+    <!-- <view class='nav_bar'>
       <view class='nav_bar_txt'>最近浏览</view>
       <view class='nav_bar_icon'>
         <text class='iconfont icon-search'></text>
       </view>
-    </view>
+    </view> -->
     <view class='comment_con'>
       <view class="weui-tab__panel">
         <view class="weui-tab__content">
-          <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="{{myBrowsed}}" wx:key="index" class='fdkz-card'>
+          <!-- <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="{{myBrowsed}}" 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>
@@ -23,22 +23,38 @@
           {{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}}丨{{item.statusTextDesp}}</view>
         <view class='changguan_title'>
           <text class='iconfont icon-comment'>   {{item.commentCount}}</text>
           <text class='iconfont icon-view'>   {{item.pv}}</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}}</text> 
         </view>
       </view>
       <text></text>
     </view>
-  </navigator>
+  </navigator> -->
+        <block wx:for="{{myBrowsed}}" wx:key="index">
+          <component-list
+            hasProduct="{{item.hasProduct}}"
+            hasPay="{{item.hasPay}}"
+            sceneId="{{item.id}}"
+            imageUrl="{{item.imageUrl}}"
+            name="{{item.name}}"
+            pavilionName="{{item.pavilionName}}"
+            statusTextDesp="{{item.statusTextDesp}}"
+            distance="{{item.distance}}"
+            online="{{item.online}}"
+            scenePv="{{item.pv}}"
+          ></component-list>
+        </block>
+        
+        <view class='noCollection' wx:if="{{myBrowsed.length < 1}}" >
+          <image src='{{noCollectionImg}}'></image>
+          <text>没有更多的记录</text>
+        </view>
+
         </view>
       </view>
     </view>

pages/user/my_saw/index.wxss

@@ -1,12 +1,9 @@
 /* pages/user/my_saw/index.wxss */
 .container{
   padding: 0;
+  margin-bottom: 80rpx;
 }
-.saw_body{
-}
-.saw_con {
 
-}
 
 .weui-tab__panel {
   padding-top: 0;
@@ -80,4 +77,25 @@
 }
 .icon-like{
   color: #E02F2F;
+}
+/* 没有收藏 */
+.noCollection{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.noCollection image{
+  width: 450rpx;
+  height: 450rpx;
+  margin: 0 auto;
+  margin-top: 196rpx;
+  margin-bottom: 272rpx;
+}
+.noCollection text{
+  color: #646464;
+  font-size: 32rpx;
+  opacity: 0.9;
 }

pages/wv_page/index.js

@@ -18,11 +18,12 @@ Page({
    */
   onLoad: function (options) {
     let url = ''
-    let { isShare } = options;
-    if(isShare){
-      url = decodeParam(options.url);
+    let { currentUrl } = app.globalData;
+    console.log(currentUrl)
+    if (currentUrl){
+      url = app.globalData.currentUrl;
     }else{
-       url = app.globalData.currentUrl;
+      url = unescape(options.link);
     }
     console.log('url', url)
     // console.log('isShare', isShare)

pages/yuezhan/comment_detail/index.js

@@ -1,7 +1,8 @@
 // pages/user/my_comment/index.js
 const {
   request,
-  serverName
+  serverName,
+  imgServer
 } = require('../../../utils/services');
 const {
   defaultImg,
@@ -21,6 +22,7 @@ Page({
     myComment: [],
     loading: false,
     currentPage: 1,
+    imgServer,
     full_star_img: "../../../imgs/icon/full.png",
     empty_star_img: "../../../imgs/icon/empty.png",
     half_star_img: "../../../imgs/icon/half.png",

pages/yuezhan/comment_detail/index.wxml

@@ -7,7 +7,7 @@
           <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" style='width:140rpx;height:140rpx;'>
-                <image class="weui-media-box__thumb" style='border-radius:0;' mode='aspectFill' src="{{exhibition.imageUrl||defaultImg}}">
+                <image class="weui-media-box__thumb" style='border-radius:0;' mode='aspectFill' src="{{imgServer + exhibition.imageUrl||defaultImg}}">
                 </image>
               </view>
               <view class="weui-media-box__bd weui-media-box__bd_in-appmsg" style='flex:2.4'>
@@ -47,7 +47,7 @@
         <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">
-              <image class="weui-media-box__thumb" mode='aspectFill' src="{{item.avatarUrl||defaultImg}}" />
+              <image class="weui-media-box__thumb" mode='aspectFill' src="{{ item.avatarUrl||defaultImg}}" />
             </view>
           </view>
           <view class="weui-cell__bd">

pages/yuezhan/index.js

@@ -47,7 +47,6 @@ Page({
       // isLogin
     })
 
-
     this.getBanner();
     this.getList(1);
   },
@@ -137,6 +136,7 @@ Page({
         openTime
       } = exhibitionList;
       console.log(res)
+      exhibitionList.forEach((currentValue) => currentValue.distance = Math.ceil(currentValue.distance))
       this.setData({
         currentPage: res.data.data.number + 1,
         lastPage,
@@ -184,6 +184,7 @@ Page({
       this.setData({
         commodityImgs: commodityImgs || []
       });
+      console.log('banner', commodityImgs)
     }, err => {
 
     }, complete => {

pages/yuezhan/index.wxml

@@ -44,7 +44,7 @@
           </view>
           <view class='right'>
             <view class="date-icon iconfont  {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>
-            <text class='distance'>{{item.hasProduct?item.pv:(item.distance+' km')}}</text>
+            <text class='distance'>{{item.hasProduct?item.pv:(item.distance || 0 +' km')}}</text>
           </view>
           <!-- <view class='changguan_title'>
             <text class='iconfont icon-comment'>   {{item.commentCount}}</text>

pages/yuezhan/search_result/index.js

@@ -1,5 +1,5 @@
 // pages/yuezhan/search/index.js
-const { request, serverName } = require('../../../utils/services');
+const { request, serverName, imgServer } = require('../../../utils/services');
 const { Toast } = require('../../../utils/util');
 const { defaultImg, noExhibitionImg, noExhibitionHallImg } = require('../../../utils/images');
 
@@ -31,7 +31,8 @@ Page({
   onLoad: function (options) {
     this.setData({
       searchText: options.searchText,
-      serverName
+      serverName,
+      imgServer
     });
     this.loadData();
     this.getKeywordCode()

pages/yuezhan/search_result/index.wxml

@@ -37,7 +37,7 @@
             <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="{{item.imageUrl||defaultImg}}">
+                  <image class="weui-media-box__thumb" mode='aspectFill' src="{{imgServer + item.imageUrl||defaultImg}}">
                     <!-- <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> -->
@@ -68,17 +68,14 @@
           </view>
         </navigator>
       </block>
-      <view class='noDataClass' style='margin:20% 0' hidden='{{exhibitionList.length>0}}'>
+      <view class='noDataClass' style='margin:20% 0'  wx:if='{{exhibitionList.length === 0 && !loading }}'>
         <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionImg}}'></image>
         <view class="tips">
           没有搜到对应的展览
         </view>
       </view>
     </view>
-    <view class="weui-loadmore" wx:if="{{loading}}">
-      <view class="weui-loading"></view>
-      <view class="weui-loadmore__tips">正在加载</view>
-    </view>
+    
 
     <view class='hot-search-con' wx:if="{{totalElements && totalElements < 5 }}">
       <view class='hot-search'>
@@ -94,7 +91,7 @@
                 <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="{{item.imageUrl||defaultImg}}">
+                      <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">
@@ -139,7 +136,7 @@
             <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="{{item.imageUrl||defaultImg}}" />
+                  <image class="weui-media-box__thumb" mode='aspectFill' src="{{imgServer + item.imageUrl||defaultImg}}" />
                 </view>
                 <view class='fix-flex'>
                   <view class="weui-media-box__title weui-flex">
@@ -156,11 +153,8 @@
           </view>
         </navigator>
       </block>
-      <view class="weui-loadmore" wx:if="{{loading}}">
-        <view class="weui-loading"></view>
-        <view class="weui-loadmore__tips">正在加载</view>
-      </view>
-      <view class='noDataClass' hidden='{{pavilionList.length>0}}'>
+      
+      <view class='noDataClass' wx:if='{{pavilionList.length === 0 && !loading}}'>
         <image class='no_exhibitionImg' mode='aspectFit' src='{{noExhibitionHallImg}}'></image>
         <view class="tips">
           没有搜到对应的展馆
@@ -170,4 +164,9 @@
     </view>
   </view>
 
+  <view class="weui-loadmore" wx:if="{{loading}}">
+    <view class="weui-loading"></view>
+    <view class="weui-loadmore__tips">正在加载</view>
+  </view>
+
 </view>

pages/zl_detail/index.js

@@ -1,5 +1,5 @@
 // pages/zl_detail/index.js
-const { request, serverName } = require('../../utils/services');
+const { request, serverName, imgServer } = require('../../utils/services');
 const WxParse = require('../../common/component/wxParse/wxParse.js');
 
 const { Toast, removeArrItem } = require('../../utils/util.js');
@@ -25,6 +25,7 @@ Page({
     isLike: false,
     likeNum: 526,
     animationData: {},
+    imgServer,
 
     tour_info_data: [{
       title: '地址：',

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="{{exhibitionDetail.imageUrl||defaultImg}}"></image>
+    <image 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'>
@@ -30,7 +30,7 @@
       <view class='iconfont iconpiaowu'></view>
       <text class='cg_detail_time'>{{exhibitionDetail.fee||'免费'}}</text>
     </view>
-    <navigator class='cg_address_warpper' hover-class='none' url="./cg_introduce/index?id={{pavilionId}}">
+    <navigator class='cg_address_warpper' hover-class='none' url="../cg_detail/cg_introduce/index?la={{exhibitionDetail.latitude}}&lo={{exhibitionDetail.longitude}}">
       <view class=' iconfont iconweizhi'></view>
       <text class='cg_address'>{{exhibitionDetail.address}}</text>
       <view class='iconfont iconkedianjibiaoshiicon'></view>
@@ -40,10 +40,11 @@
     </view>
   </view>
   <view class='zl_artist' wx:if="{{exhibitionDetail.pavilions.length>0}}">
-    <view class='fdkk-cells'>
+
+    <navigator class='fdkk-cells' url="../cg_detail/index?id={{exhibitionDetail.pavilions[0].id}}">
       <view class='artist_avatar'>
         <view class='artist_avatar_item'>
-          <image class='artist_avatar_img' mode='aspectFill' src="{{exhibitionDetail.pavilions[0].logoUrl||defaultImg}}"></image>
+          <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>
@@ -51,7 +52,8 @@
         </view>
         <text class='iconfont iconkedianjibiaoshiicon'></text>
       </view>
-    </view>
+    </navigator>
+
   </view>
   <view class='tour_guide'>
     <view class='fdkk-cells' style='padding: 0;padding-bottom:30rpx;margin-bottom:0;'>

project.config.json

@@ -32,7 +32,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 1,
+			"current": 10,
 			"list": [
 				{
 					"id": 0,
@@ -80,6 +80,34 @@
 					"pathName": "pages/zl_detail/index",
 					"query": "id=6158",
 					"scene": null
+				},
+				{
+					"id": 7,
+					"name": "我的收藏",
+					"pathName": "pages/user/my_follow/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "我的足迹",
+					"pathName": "pages/user/my_saw/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "我的评论",
+					"pathName": "pages/user/my_comment/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "联系我们",
+					"pathName": "pages/user/my_contact/index",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

utils/services.js

@@ -2,10 +2,11 @@ const {
   Toast
 } = require('./util');
 
-// const serverName = 'https://www.4dmuseum.cn'; // 正式
+//const serverName = 'https://www.4dmuseum.cn'; // 正式
 const serverName = 'http://192.168.0.100:8081'; // 本地
 
 const imgServer = 'https://www.4dmuseum.cn'
+//const imgServer = ''
 
 const urls = {
   //用户API