update in 0305

app.json

@@ -22,7 +22,9 @@
     "pages/zl_detail/create_evaluation/index",
     "pages/yuezhan/comment_detail/index",
     "pages/yuezhan/pay_page/rule_detail/index",
-    "pages/login_page/index"
+    "pages/login_page/index",
+    "common/components/drop-down/index",
+    "pages/user/my_contact/index"
   ],
   "window": {
     "backgroundTextStyle": "dark",

app.wxss

@@ -253,7 +253,7 @@ html, body, page {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 490rpx;
+  width: 100%;
   display: inline-block;
 }
 
@@ -373,4 +373,8 @@ html, body, page {
 }
 .icon-zan_active{
   color: #e02f2f
+}
+
+component-search{
+  width: 100%;
 }

common/components/component-search/component-search.js

@@ -23,7 +23,7 @@ Component({
   methods: {
     to_search: function () {
       wx.navigateTo({
-        url: './search/index',
+        url: '../yuezhan/search/index',
         success: function (res) { },
         fail: function (res) { },
         complete: function (res) { },

common/components/component-search/component-search.wxml

@@ -1,7 +1,7 @@
 <!-- 组件模板 -->
 <view class="wrapper">
   <view class='search-wrapper'  bindtap='to_search'>
-    <view class='iconfont icon-sousuo'></view>
+    <view class='iconfont iconsousuo'></view>
     <text class='search-text'>{{text}}</text>
   </view>
   <slot></slot>

common/components/component-search/component-search.wxss

@@ -13,7 +13,7 @@
   border-radius: 15rpx;
 }
 .iconfont {
-  font-size: 22rpx;
+  font-size: 32rpx;
   margin-right: 15rpx;
 }
 .search-text{

common/components/drop-down/index.js

@@ -0,0 +1,76 @@
+// common/components/drop-down/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  options: {
+    addGlobalClass: true,
+    externalClasses: ['drop-con']
+  },
+  properties: {
+    navItems: {
+      type: Object,
+      value: false,
+      observer(newVal, oldVal, changedPath) {
+      }
+    },
+    exhiNum: {
+      type: Number,
+      value: 0,
+      observer(newVal, oldVal, changedPath) {
+      }
+    },
+    activeType: {
+      type: String,
+      value: 0,
+      observer(newVal, oldVal, changedPath) {
+      }
+    },
+    activeDist: {
+      type: String,
+      value: 0,
+      observer(newVal, oldVal, changedPath) {
+      }
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    activeIdx: 1
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closeMask() {
+      const myEventDetail = false // detail对象，提供给事件监听函数
+      const myEventOption = {} // 触发事件的选项
+      this.triggerEvent('closeMask', myEventDetail, myEventOption)
+    },
+    topItem(e) {
+      console.log()
+      let type = this.data.navItems.type
+      let id = e.currentTarget.dataset.id
+      let myEventDetail, myEventOption
+      if (type === "dist") {
+        myEventDetail = {
+          activeType: this.data.activeType,
+          activeDist: id
+        } // detail对象，提供给事件监听函数
+        myEventOption = {} // 触发事件的选项
+      }
+      else {
+        myEventDetail = {
+          activeType: id,
+          activeDist: this.data.activeDist
+        } // detail对象，提供给事件监听函数
+        myEventOption = {} // 触发事件的选项
+      }
+
+      this.triggerEvent('activeItem', myEventDetail, myEventOption)
+
+    }
+  }
+})

common/components/drop-down/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

common/components/drop-down/index.wxml

@@ -0,0 +1,17 @@
+<!--common/components/drop-down/index.wxml-->
+<view class='drop-container' bindtap='closeMask'>
+  <view class='drop-body' >
+    <view class='drop-nav'>
+      <view>{{exhiNum}}个展览</view>
+      <view class='drop-tag'>{{navItems.name}}
+        <text class='iconfont iconpaixuxialacaidan'></text>
+      </view>
+    </view>
+    <view class='drop-items'>
+      <view bindtap='topItem' data-id='{{item.id}}' class="drop-item {{(item.id==activeType||item.id==activeDist)&&'drop-item-active'}}" wx:for="{{navItems.arr}}" wx:key="index">
+        {{item.name}}
+        <text wx:if="{{item.id==activeType||item.id==activeDist}}" class='iconfont iconxuanzhong'></text>
+      </view>
+    </view>
+  </view>
+</view>

common/components/drop-down/index.wxss

@@ -0,0 +1,36 @@
+/* common/components/drop-down/index.wxss */
+.drop-container{
+  width: 100%;
+  height: 100%;
+  color: #000;
+  background: rgba(0, 0, 0, 0.5);
+  overflow: hidden;
+}
+.drop-body{
+  background: #fff;
+  padding: 0 40rpx 40rpx;
+  font-size: 28rpx;
+  overflow: hidden;
+}
+.drop-nav{
+  display: flex;
+  justify-content: space-between;
+  height: 120rpx;
+  line-height: 120rpx;
+  font-weight: bold;
+}
+.drop-tag{
+  display: flex;
+  align-items: center;
+}
+
+.drop-item{
+  height: 120rpx;
+  line-height: 120rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.drop-item-active{
+  color: #E02F2F;
+}

common/style/lib.wxss

@@ -102,3 +102,99 @@
 }
 
 
+
+@font-face {
+  font-family: 'iconfont';  /* project id 1068769 */
+  src: url('//at.alicdn.com/t/font_1068769_vw1exh0ln4i.eot');
+  src: url('//at.alicdn.com/t/font_1068769_vw1exh0ln4i.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_1068769_vw1exh0ln4i.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_1068769_vw1exh0ln4i.woff') format('woff'),
+  url('//at.alicdn.com/t/font_1068769_vw1exh0ln4i.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_1068769_vw1exh0ln4i.svg#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: 'iconfont' !important;
+  font-size: 32rpx;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale; 
+}
+
+
+.iconriqi:before {
+  content: "\e601";
+}
+
+.iconpaixuxialacaidan:before {
+  content: "\e602";
+}
+
+.iconkedianjibiaoshiicon:before {
+  content: "\e603";
+}
+
+.icondianhua:before {
+  content: "\e604";
+}
+
+.iconpiaowu:before {
+  content: "\e605";
+}
+
+.iconredu:before {
+  content: "\e606";
+}
+
+.iconweishoucang:before {
+  content: "\e607";
+}
+
+.iconxianxia:before {
+  content: "\e609";
+}
+
+.iconxianshangkanzhan:before {
+  content: "\e60a";
+}
+
+.iconyoujian:before {
+  content: "\e60b";
+}
+
+.iconweizhi:before {
+  content: "\e60c";
+}
+
+.iconzhuye:before {
+  content: "\e60d";
+}
+
+.iconshijian:before {
+  content: "\e60e";
+}
+
+.iconyishoucang:before {
+  content: "\e60f";
+}
+
+.iconweixin:before {
+  content: "\e610";
+}
+
+.iconshangwuhezuo:before {
+  content: "\e611";
+}
+
+.iconwode:before {
+  content: "\e612";
+}
+
+.iconxuanzhong:before {
+  content: "\e613";
+}
+
+.iconsousuo:before {
+  content: "\e608";
+}
+

pages/swkz/index.wxml

@@ -12,18 +12,11 @@
         <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}}丨{{item.statusTextDesp}}</view>
+        <view class='date-txt'>{{item.pavilionName}}</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> 
+          <text class='iconfont iconredu'>   {{item.pv}}</text>
         </view>
       </view>
       <text></text>

pages/tongcheng/index.js

@@ -1,25 +1,62 @@
 //index.js
 //获取应用实例
 const { request, serverName } = require('../../utils/services');
-const { Toast } = require('../../utils/util.js');
+const { Toast, qqmapsdk } = require('../../utils/util.js');
 const { defaultImg, noExhibitionImg } = require('../../utils/images');
 const WxParse = require('../../common/component/wxParse/wxParse.js');
 
-const QQMapWX = require('../../common/component/mapSDK/qqmap-wx-jssdk.min.js');
-var qqmapsdk = "";
+// const QQMapWX = require('../../common/component/mapSDK/qqmap-wx-jssdk.min.js');
 
 const app = getApp();
+const distItems = [
+  {
+    name: '综合排序',
+    id: '综合排序',
+    idx:0
+  },
+  {
+    name: '按距离排序',
+    id: '距离排序',
+    idx: 1
+  },
+  {
+    name: '按热度排序',
+    id: '热度排序',
+    idx: 2
+  }
+]
+const typeItems = [
+  {
+    name: '展览中',
+    id: '展览中',
+    idx: 1
+  },
+  {
+    name: '即将开始',
+    id: '即将开始',
+    idx: 2
+  },
+  {
+    name: '已结束',
+    id: '已结束',
+    idx: 3
+  },
+  {
+    name: '全部状态',
+    id: '全部状态',
+    idx: 0
+  }
+]
 
 Page({
   data: {
-    navItem: [{ title: '', tag: 5 }, { title: '附近', tag: "" }, { title: '热门', tag: 0 }, { title: '展览中', tag: 4 }, { title: '即将开始', tag: 2 }, { title: '已结束', tag: 6 }],
+    navItem: distItems,
     indicatorDots: true,
     autoplay: true,
     interval: 5000,
     duration: 1000,
     activeIndex: 0,
     locationName: "珠海",
-    animationData: {},
     isLike: false,
     showConfirm: false,
     tag: "",
@@ -27,11 +64,14 @@ Page({
     commodityImgs: [
       '../../imgs/testImg/thumbSmallImg.jpg',
       '../../imgs/testImg/thumbSmallImg.jpg',
-
     ],
     type: 5,
     testImg: '../../imgs/testImg/fdkz.png',
-    getLocationBtn: false
+    getLocationBtn: false,
+    isShow: false,
+    exhiNum:0,
+    activeDist:'综合排序',
+    activeType:'全部状态'
   },
 
   to_search_exhibition: function () {
@@ -44,25 +84,12 @@ Page({
   },
 
   onLoad: function () {
-    this.getList(1)
-    qqmapsdk = new QQMapWX({
-      key: '2Z3BZ-H7EWO-F4YWX-SG5JF-2VOK2-S2FUB'
-    });
+    
     this.getLocationName();
-
-    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.getList(1)
 
     this.setData({
       serverName,
-      animationData: animation.export(),
       noExhibitionImg,
       defaultImg
     })
@@ -73,13 +100,13 @@ Page({
   onShow: function () {
     let { city, clickToSelect, collectedArr, collectedChange } = app.globalData;
     let { activeIndex, exhibitionList } = this.data
-    
-    if (clickToSelect){
+
+    if (clickToSelect) {
       // console.log(city)
       this.setData({
         locationName: city || "珠海",
         exhibitionList: [],
-        activeIndex:0,
+        activeIndex: 0,
         type: 5
       });
 
@@ -91,9 +118,9 @@ Page({
       }
 
     }
-    if (collectedChange){
-      for (let i = 0; i < exhibitionList.length; i++ ){
-        for (let j = 0; j < collectedArr.length;j++){
+    if (collectedChange) {
+      for (let i = 0; i < exhibitionList.length; i++) {
+        for (let j = 0; j < collectedArr.length; j++) {
           if (collectedArr[j].collectedId == exhibitionList[i].id) {
             exhibitionList[i].hasCollect = collectedArr[j].status
             if (exhibitionList[i].hasCollect) {
@@ -108,7 +135,7 @@ Page({
           }
         }
         // console.log(collectedArr.status, collectedArr.collectedId)
-     
+
       }
       this.setData({
         exhibitionList
@@ -116,9 +143,6 @@ Page({
     }
     app.globalData.clickToSelect = false;
     // app.globalData.collectedChange = false;
-    
-
-
   },
 
   addLike: function (e) {
@@ -178,7 +202,31 @@ Page({
     console.log(this.data.exhibitionList)
   },
 
-  
+  showDrop: function (e) {
+    let tag = e.target.dataset.id
+    let name = e._relatedInfo.anchorTargetText
+    console.log(tag)
+    if (tag==='type'){
+      this.setData({
+        navItem: {
+          type: tag,
+          name: name,
+          arr: typeItems
+        },
+        isShow: !this.data.isShow
+      })
+    }
+    else{
+      this.setData({
+        navItem: {
+          type: tag,
+          name: name,
+          arr: distItems
+        },
+        isShow: !this.data.isShow
+      })
+    }
+  },
 
   getLocationName: function () {
     // 调用接口
@@ -203,6 +251,7 @@ Page({
             this.setData({
               locationName
             })
+            this.getList(1)
           },
           fail: function (res) {
             console.log(res)
@@ -219,37 +268,44 @@ Page({
   },
 
   getList: function (page) {
-    let { type, locationName } = this.data;
+    let { locationName, latitude, longitude, activeDist, activeType } = this.data;
     let loginSessionKey = wx.getStorageSync("token");
-    console.log(loginSessionKey)
-    console.log(type, locationName);
+    let sort = distItems.find(item => item.id === activeDist).idx
+    let type = typeItems.find(item => item.id === activeType).idx
+    console.log(sort, type)
+    console.log(type, locationName, latitude, longitude);
 
     this.setData({
       loading: true
     })
-    request["getExhibitionList"]({
+    request["getExhibitionListOffline"]({
       page: page,
       type: type,
       loginSessionKey,
-      city: locationName
+      city: locationName,
+      sort,
+      type,
+      lng: longitude,
+      lat: latitude
     }, '', res => {
-
       let tempContent = this.data.exhibitionList
         ? this.data.exhibitionList
         : [];
       let { last: lastPage, totalPages, totalElements, content: exhibitionList } = res.data.data;
 
+
+     
+
       let { openTime } = exhibitionList;
-      console.log(res)
       this.setData({
         currentPage: res.data.data.number + 1,
         lastPage,
         loading: false,
         exhibitionList: tempContent.concat(exhibitionList),
+        exhiNum: totalElements
       });
-      console.log(exhibitionList)
+      console.log(this.data.exhibitionList)
       wx.stopPullDownRefresh();
-
       // WxParse.wxParseTemArray("replyTemArray", 'reply', replyArr.length, that)
 
     }, err => {
@@ -264,7 +320,7 @@ Page({
     let loginSessionKey = wx.getStorageSync("token");
 
     wx.getSetting({
-      success:res=>{
+      success: res => {
         if (!res.authSetting['scope.userLocation']) {
           Toast.showToast('tip', "无法获取用户位置", () => {
             return;
@@ -278,12 +334,11 @@ Page({
             loading: true,
             getLocationBtn: false
           })
-          if(!longitude&&!latitude){
+          if (!longitude && !latitude) {
             wx.getLocation({
               success: res => {
                 let longitude = (this.longitude = res.longitude);
                 let latitude = (this.latitude = res.latitude);
-                console.log("dqwdwd6w5d465ad4w")
                 request["getNearByList"]({
                   page: page,
                   loginSessionKey,
@@ -319,7 +374,7 @@ Page({
                 })
               },
             })
-          }else{
+          } else {
             request["getNearByList"]({
               page: page,
               loginSessionKey,
@@ -343,23 +398,15 @@ Page({
               });
               console.log(exhibitionList)
               wx.stopPullDownRefresh();
-
-              // WxParse.wxParseTemArray("replyTemArray", 'reply', replyArr.length, that)
-
             }, err => {
-
             }, complete => {
 
             })
           }
-         
+
         }
       }
     })
-
-
-
-
   },
 
   closeDialog: function () {
@@ -367,6 +414,7 @@ Page({
       showConfirm: false
     })
   },
+
   loadMore: function () {
     let { activeIndex } = this.data
     if (!this.data.lastPage) {
@@ -377,12 +425,11 @@ Page({
       else {
         this.getList(this.data.currentPage + 1);
       }
-
-
     } else {
       return;
     }
   },
+
   onReachBottom: function () {
     if (!this.data.loading) {
       this.loadMore();
@@ -391,7 +438,6 @@ Page({
 
   },
 
-
   tabClick: function (e) {
     // console.log(e.currentTarget.dataset)
     this.setData({
@@ -408,6 +454,22 @@ Page({
     }
   },
 
+  onIsclose: function (e) {
+    this.setData({
+      isShow: e.detail
+    })
+  },
+
+  getActiveItem:function(e){
+    console.log(e)
+    let { activeDist, activeType} = e.detail
+    this.setData({
+      activeDist,
+      activeType,
+      exhibitionList:[]
+    })
+    this.getList(1)
+  },
   to_search: function () {
     wx.navigateTo({
       url: './search/index',

pages/tongcheng/index.json

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

pages/tongcheng/index.wxml

@@ -1,24 +1,29 @@
 <!--index.wxml-->
+<drop-down navItems="{{navItem}}" activeType="{{activeType}}" activeDist="{{activeDist}}" exhiNum="{{exhiNum}}" class="drop-con" bind:closeMask="onIsclose" bind:activeItem="getActiveItem" style="height:{{isShow?'100%':'0'}}"></drop-down>
 <view class='container'>
   <view class='nav-con'>
     <view class='yuezhan-nav'>
+      <view class="search-navbar">
+        <component-search></component-search>
+      </view>
       <view class="yuezhan-navbar">
-        <block wx:for="{{navItem}}" wx:key="index">
-          <view id='{{index}}' class="nav-item {{index==activeIndex?'nav-item_on':''}}" bindtap="{{index==0?'to_search':'tabClick'}}" data-tag="{{item.tag}}">
-            <view>
-              <text wx:if="{{index==0}}" bindtap='to_search' class="iconfont icon-location {{index==0&&index==activeIndex?'icon-like_active':''}}"></text> {{index==0?locationName:item.title}}
-            </view>
+        <view bindtap='to_search' class='nav-tag nav-active'>{{locationName}}
+          <text class='iconfont iconpaixuxialacaidan'></text>
+        </view>
+        <view class='nav-right'>
+          <view bindtap='showDrop' data-id='dist' class='nav-tag'>{{activeDist}}
+            <text class='iconfont iconpaixuxialacaidan'></text>
+          </view>
+          <view bindtap='showDrop' data-id='type' class='nav-tag'>{{activeType}}
+            <text class='iconfont iconpaixuxialacaidan'></text>
           </view>
-        </block>
-        <view class='nav-item'>
-          <text class='iconfont icon-search' bindtap='to_search_exhibition'></text>
         </view>
       </view>
     </view>
   </view>
   <navigator hover-class='none' url="{{item.hasProduct&&!item.hasPay?('../yuezhan/pay_page/index?id='+item.id):(item.hasProduct?'../wv_page/index?id='+item.id:'../zl_detail/index?id='+item.id)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
     <view class='fdkz-card-img'>
-      <view class="fdkz-card-tag {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag_finish':'fdkz-card-tag_coming'}}">
+      <view class="fdkz-card-tag">
         <text class='fdkz-card-tag-txt'>{{item.statusText||'常设展'}}</text>
       </view>
       <image src="{{item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
@@ -28,18 +33,11 @@
         <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}}丨{{item.statusTextDesp}}</view>
+        <view class='date-txt'>{{item.pavilionName}}</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> 
+          <text class='iconfont iconweizhi'> {{item.distance||0}} km</text>
         </view>
       </view>
       <text></text>

pages/tongcheng/index.wxss

@@ -1,8 +1,7 @@
 /* pages/yuezhan/index.wxss */
 
 .container {
-  padding: 0;
-  margin-top: 70rpx;
+  margin-top: 210rpx;
 }
 
 .nav-con {
@@ -11,21 +10,21 @@
   top: 0;
   z-index: 999;
   width: 100%;
-  height: 70rpx;
+  height: 202rpx;
   background: #fff;
 }
 
-.yuezhan-nav {
-  height: 66rpx;
-}
-
-.yuezhan-navbar {
+.yuezhan-navbar, .search-navbar {
   display: flex;
-  padding: 0 10rpx;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   color: #999;
   background: #fff;
 }
+.search-navbar{
+  height: 130rpx;
+}
+
+
+
 
 .nav-item {
   margin: 0 11rpx;
@@ -42,7 +41,6 @@
 
 .iconfont {
   font-size: 22rpx;
-  margin-right: 15rpx;
 }
 
 .icon-search {
@@ -62,16 +60,6 @@
   width: 100%;
   height: 100%;
 }
-
-.title-txt {
-  /* font-size: 28rpx;
-   overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap; 
-   width: 600rpx; 
-  display: inline-block; */
-}
-
 .fdkz-card {
   margin-top: 0;
 }
@@ -98,4 +86,52 @@
   font-size: 32rpx;
   margin-right: 0;
   
+}
+.yuezhan-navbar {
+  padding: 0 44rpx 30rpx; 
+  justify-content: space-between;
+}
+.nav-right{
+  display: inline-block;
+}
+
+.nav-tag{
+  display: flex;
+  align-items: center;
+  color: #000;
+  font-size: 28rpx;
+  float: left;
+  font-weight: bold;  
+}
+
+.nav-active{
+  color: #E02F2F
+}
+.nav-right .nav-tag:first-child{
+  margin-right: 30rpx;
+}
+
+.iconpaixuxialacaidan{
+  font-size: 14rpx;
+  margin-left: 8rpx;
+}
+
+.drop-con{
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+  width: 100%;
+  height: 100%;
+  transition: all ease 0.3s;
+}
+
+
+.fdkz-card-tag{
+  background: #fff;
+  border-radius:10rpx;
+}
+
+.fdkz-card-tag-txt{
+  color: #E02F2F;
 }

pages/tongcheng/search/index.js

@@ -83,6 +83,10 @@ Page({
     wx.getLocation({
       type: 'wgs84',
       success: (res) => {
+        this.setData({
+          latitude: res.latitude,
+          longitude: res.longitude
+        })
         // console.log('0202', res)
         //2、根据坐标获取当前位置名称，显示在顶部:腾讯地图逆地址解析
         qqmapsdk.reverseGeocoder({
@@ -117,15 +121,19 @@ Page({
   getList: function (page, locationName) {
     let loginSessionKey = wx.getStorageSync("token");
     console.log(loginSessionKey)
+    let { latitude, longitude, activeDist, activeType } = this.data;
 
     this.setData({
       loading: true
     })
-    request["getExhibitionList"]({
+    request["getExhibitionListOffline"]({
       page: page,
-      type: 5,
       loginSessionKey,
-      city: locationName||""
+      city: locationName||"",
+      sort:0,
+      type:0,
+      lng: longitude,
+      lat: latitude,
     }, '', res => {
 
       let { totalElements: exhibitionNum } = res.data.data;

pages/tongcheng/search/index.wxml

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

pages/tongcheng/search/index.wxss

@@ -12,7 +12,6 @@
   width: 100%;
   background: #fff;
   z-index: 999;
-  padding-top: 10rpx;
 }
 .search-con, .hot-search-con {
   padding: 0 20rpx;
@@ -29,14 +28,16 @@
 .yuezhan-nav {
   z-index: 999;
   width: 100%;
-  margin-top: 20rpx;
-  border-bottom: 2rpx solid #efefef;
+  box-shadow: 0 0 6rpx #efefef;
 }
 
 .yuezhan-navbar {
   display: flex;
   color: #999;
+  height: 94rpx;
   background: #fff;
+  justify-content: center;
+  align-items: center;
 }
 
 .nav-item {
@@ -55,24 +56,46 @@
   width: 50%;
 }
 .city_box_con{
-  padding: 0 20rpx;
+  padding: 0 32rpx;
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
+  box-sizing: border-box;
 }
 .weui-cell{
-  padding: 20rpx;
+  padding: 40rpx 44rpx 20rpx;
+  font-weight: bold;
 }
 
 .city_box{
-  width: 200rpx;
-  height: 100rpx;
-  border: 2rpx #ccc solid;
+  width: 320rpx;
+  height: 202rpx;
+  overflow: hidden;
+  border-radius: 10rpx;
   line-height: 50rpx;
   text-align: center;
   margin: 10rpx;
+  background: #eee;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  font-size: 36rpx;
+  font-weight: bold;
+  padding: 30rpx 0;
+  box-sizing: border-box;
+}
+
+.current_box{
+  background: #E65858;
+  color: #fff;
+}
+
+
+.current_box .city_box_dec{
+  color:#fff;
 }
 
 .city_box_dec{
-  color:#999;
+  color:#575757;
+  font-weight: normal;
 }

pages/user/index.js

@@ -19,7 +19,7 @@ Page({
 
     likeImg: '../../imgs/icon/like.png',
     commentImg: '../../imgs/icon/comment.png',
-    sawImg: '../../imgs/icon/saw.png',
+    sawImg: '../../imgs/icon/saw.png', 
     tabItem: [{
       name: '待付款',
       tag: "0",
@@ -43,7 +43,7 @@ Page({
       img: "../../imgs/icon/comment.png",
       id: 1
     }, {
-      name: '看过',
+      name: '足迹',
       img: "../../imgs/icon/saw.png",
       id: 2
     }],
@@ -460,8 +460,8 @@ Page({
 
 
   clickCell: function() {
-    this.setData({
-      active: !this.data.active
+    wx.navigateTo({
+      url: './my_contact/index',
     })
   },
 

pages/user/index.wxml

@@ -1,100 +1,48 @@
 <!--pages/user/index.wxml-->
 <view class='container'>
   <view class='user_bg'>
-    <image mode='aspectFill' class='user_bg_img' src='{{testImg}}'></image>
+    <image mode='aspectFill' class='user_bg_img'></image>
     <view class='user_avatar_bg'>
       <view class='user_avatar_con'>
         <image mode="aspectFit" class='user_avatar' src='{{avatarUrl||avatar}}'></image>
-        <text class='user_nickName'>{{isLogin?avatarName:"未登录"}}</text>
+        <text class='user_nickName'>{{isLogin?avatarName:"登录"}}</text>
         <button open-type="getUserInfo" class='user_avatar_btn' bindgetuserinfo="_getUserInfoToLogin"></button>
       </view>
-      <view class='user-logout' bindtap='_logout' wx:if="{{isLogin}}">退出账号</view>
     </view>
   </view>
-  <view class='tab-list'>
+  <view>
     <view class="fdkk-cells">
-      <view class='tab-list_item' wx:for="{{tabList}}" bindtap='tapByIdx' data-idx='{{item.id}}' wx:key="index">
-        <image class='tab-list_item_img' src='{{item.img}}'></image>
-        <text class='tab-list_item_txt'>{{item.name}}</text>
-      </view>
+    <view  wx:for="{{tabList}}" bindtap='tapByIdx' data-idx='{{item.id}}' wx:key="index">
+    
     </view>
-  </view>
-  <view class='user_order'>
-    <view class="fdkk-cells">
-      <view bindtap='_myOrder' hover-class='none' class="weui-cell">
+      <view wx:for="{{tabList}}" bindtap='tapByIdx' data-idx='{{item.id}}' wx:key="index"  hover-class='none' class="weui-cell">
         <view class="weui-cell__hd">
-          <text class="iconfont icon-order"></text>
         </view>
         <view class="weui-cell__bd">
-          <text class='list-txt'>我的订单</text>
-          <text class='list-txt all_order'>全部订单</text>
-          
+          <text class='list-txt'>我的{{item.name}}</text>
         </view>
         <view class="weui-cell__ft weui-cell__ft_in-access"></view>
       </view>
-      <view style='padding:30rpx;' class="weui-cell">
-        <view class="weui-cell__bd">
-          <view class='nav-tab'>
-            <view class='nav-tab-item' wx:for='{{tabItem}}' bindtap='tapToOrderByidx' data-status="{{item.tag}}" data-id='{{item.id}}' wx:key="index">{{item.name}}</view>
-          </view>
-        </view>
-      </view>
-      <view bindtap='clickCell' class="weui-cell" >
+
+      <view bindtap='clickCell' class="weui-cell">
         <view class="weui-cell__hd">
-          <text class="iconfont icon-contart"></text>
         </view>
         <view class="weui-cell__bd">
           <text class='list-txt'>联系我们</text>
         </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access {{active?'weui-cell__ft_in-access_active':''}}"></view>
-      </view>
-      <view class=" contact {{active?'contact_active':''}}">
-
-        <view class="weui-cell__bd contact_us">
-          <view class='list-txt'>客服电话：4006698025</view>
-          <view class='list-txt'>客服邮箱：service@4dkankan.com</view>
-          <view class='list-txt'>客服微信：18666146673</view>
-          <view class='list-txt'><text decode='true'>商&emsp;&emsp;务：0756-6996796/6996791</text></view>
-        </view>
+        <view class="weui-cell__ft weui-cell__ft_in-access"></view>
       </view>
     </view>
   </view>
-  <!-- <view class=''>
+  <view class='user_order' wx:if="{{isLogin}}">
     <view class="fdkk-cells">
-       <navigator url="./my_reward/index" hover-class='none' class="weui-cell">
+      <view bindtap='_logout' hover-class='none' class="weui-cell">
         <view class="weui-cell__hd">
-          <text class="iconfont icon-gift"></text>
         </view>
         <view class="weui-cell__bd">
-          <text class='list-txt'>我的奖励</text>
-        </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-      </navigator> 
-      <view bindtap='_myLikes' class="weui-cell">
-        <view class="weui-cell__hd">
-          <text class="iconfont icon-heart"></text>
-        </view>
-        <view class="weui-cell__bd">
-          <text class='list-txt'>我喜欢的</text>
-        </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-      </view>
-      <view bindtap='clickCell' class="weui-cell">
-        <view class="weui-cell__hd">
-          <text class="iconfont icon-contart"></text>
-        </view>
-        <view class="weui-cell__bd">
-          <text class='list-txt'>联系我们</text>
-        </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access {{active?'weui-cell__ft_in-access_active':''}}"></view>
-      </view>
-      <view class=" contact {{active?'contact_active':''}}">
-
-        <view class="weui-cell__bd contact_us">
-          <view class='list-txt'>客服电话：0756-46548484</view>
-          <view class='list-txt'>客服邮箱：rs@4dage.com</view>
+          <text class='list-txt'>退出</text>
         </view>
       </view>
     </view>
-  </view> -->
+  </view>
 </view>

pages/user/index.wxss

@@ -27,7 +27,7 @@
 .user_avatar_con {
   width: 100%;
   position: absolute;
-  top: 22%;
+  top: 12%;
   flex-direction: column;
   display: flex;
   align-items: center;
@@ -35,23 +35,23 @@
 
 .user_nickName {
   color: #000;
-  margin-top: 10rpx;
+  margin-top: 30rpx;
+  font-size: 36rpx;
 }
 
 .user_avatar {
   background: #ccc;
-  width: 160rpx;
-  height: 160rpx;
-  border-radius: 80rpx;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 50%;
 }
 
 .user_avatar_btn {
-  /* background-image: '../../imgs/testImg/userIcon.png'; */
-  width: 160rpx;
-  height: 160rpx;
-  border-radius: 80rpx;
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 50%;
   position: relative;
-  top: -212rpx;
+  top: -281rpx;
   opacity: 0;
 }
 
@@ -70,6 +70,7 @@
 
 .fdkk-cells {
   margin: 10rpx 0;
+  padding: 0 62rpx;
   background: #fff;
 }
 
@@ -81,6 +82,7 @@
 
 .list-txt {
   font-size: 32rpx;
+  color: #646464;
 }
 
 .no-border {
@@ -88,7 +90,8 @@
 }
 
 .weui-cell {
-  border-bottom: 1rpx solid #efefef;
+  border-top: 1rpx solid #efefef;
+  padding: 30rpx 0; 
 }
 
 .weui-cell:before {
@@ -105,9 +108,8 @@
 }
 
 .user_order {
-  background: #eee;
-  /* height: 100%; */
-  padding-top: 10rpx;
+  background: #efefef;
+  padding-top: 20rpx;
 }
 
 .contact_us {
@@ -122,7 +124,6 @@
 .contact {
   overflow: hidden;
   padding: 0;
-  margin: 20rpx 30rpx;
   position: relative;
   height: 0;
   transition: height 0.2s linear;

pages/user/my_contact/index.js

@@ -0,0 +1,66 @@
+// pages/user/my_contact/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/user/my_contact/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/user/my_contact/index.wxml

@@ -0,0 +1,2 @@
+<!--pages/user/my_contact/index.wxml-->
+<text>pages/user/my_contact/index.wxml</text>

pages/user/my_contact/index.wxss

@@ -0,0 +1 @@
+/* pages/user/my_contact/index.wxss */

pages/yuezhan/index.wxss

@@ -108,9 +108,7 @@
 .swiper-item{
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
-component-search{
-  width: 100%;
-}
+
 .navigator-title{
   font-size: 37rpx;
   font-weight: bold;

pages/yuezhan/pay_page/index.wxml

@@ -32,7 +32,7 @@
       <text class='zl_detail_info_subTxt_title'>票务：</text>
       <text class='zl_detail_info_subTxt_txt'>{{exhibitionDetail.fee||'免费'}}</text>
       <view class="like_style">
-        <text data-idx="{{index}}" data-type="{{exhibitionDetail.hasCollect}}" data-id="{{item.id}}" class="iconfont {{exhibitionDetail.hasCollect?'icon-like':'icon-empty_like'}}" catchtap='addLike'>
+        <text data-idx="{{index}}" data-type="{{exhibitionDetail.hasCollect}}" data-id="{{item.id}}" class="iconfont {{exhibitionDetail.hasCollect?'iconyishoucang':'iconweishoucang'}}" catchtap='addLike'>
         <!-- <text class='like-num'>{{exhibitionDetail.collectionsCount}}</text> -->
         <text class='like-status'>{{exhibitionDetail.hasCollect?'已收藏':'未收藏'}}</text>
         </text>

pages/yuezhan/pay_page/index.wxss

@@ -249,7 +249,7 @@ image{
   color: #999;
 }
 
-.icon-like {
+.iconyishoucang {
   color: #e02f2f;
 }
 

pages/yuezhan/search_result/index.wxml

@@ -3,11 +3,6 @@
 <view class='container'>
   <view class='top-nav'>
     <view class='search-con'>
-      <!-- <view class='search-bar'>
-        <text class='iconfont icon-search fix-icon-search' bindtap='searchByText'></text>
-        <input placeholder="输入关键词" bindconfirm="searchByText" bindinput="bindInput" value="{{searchText}}" data-key="searchText" class='search-input' focus="{{focus}}" />
-      </view> -->
-      
     <view class='search-bar'>
       <view class='search-wrapper'>
         <text class='iconfont icon-sousuo fix-icon-search' bindtap='searchByText'></text>

pages/zl_detail/create_evaluation/index.wxml

@@ -1,30 +1,14 @@
- <import src="../../../common/component/wxStar/wxStar/wxStar.wxml" /> 
+<import src="../../../common/component/wxStar/wxStar/wxStar.wxml" />
 
 <view class="container" hidden='{{loading}}'>
-  <view style='text-align:center;font-size:34rpx;width:100%'>
-    点击星星评分
-       <template is="wxStar" data="{{wxStar: wxStar}}" /> 
-
-    <!-- <view style='margin-top:20rpx;'>
-      <image wx:for="{{5}}" wx:key="index" class="comment-img__item" mode='aspectFill' src="{{full_star_img}}"></image>
-    </view> -->
+  <view class='star-con'>
+    <view class='star-txt'>点击星星评分</view>
+    <template is="wxStar" data="{{wxStar: wxStar}}" />
+  </view>
+  <view class='comment_area'>
+    <textarea bindinput='getContent' value="{{content}}" maxlength="200" />
   </view>
-  <view class="weui-cells">
-    <view class="weui-panel__bd">
-      <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
-        <view class="weui-cell">
-          <view class="weui-cell__bd">
-            <textarea bindinput='getContent' value="{{content}}" maxlength="200" placeholder="{{currentStar>0?'写几句短评吧':'给看展打个分吧'}}" />
-            <view class='btn_container'>
-            <text bindtap='clearComment' class='btn-done'>撤销</text>
-            <text bindtap='submit' class='btn-primary'>提交</text>
-            </view>
-            
-          </view>
-        </view>
-        <view>
-        </view>
-      </view>
-    </view>
+  <view class='btn_container'>
+    <view bindtap='submit' class='btn-primary'>留言</view>
   </view>
 </view>

pages/zl_detail/create_evaluation/index.wxss

@@ -1,5 +1,9 @@
 /* pages/teacher/teacher-to-evaluation/index.wxss */
 @import "../../../common/component/wxStar/wxStar/wxStar.wxss";
+.container{
+  background: #F5F5F5;
+  padding: 0;
+}
 
 .upload-img {
   border: 1px solid #ccc;
@@ -27,25 +31,41 @@ image {
   height: 140rpx;
   line-height: 140rpx;
 }
-.weui-cell{
-  border: 2rpx solid #ccc; 
-}
+
 .comment-img__item{
   width: 70rpx;
   height: 70rpx;
 }
 .btn_container{
   right: 0;
-  float: right;
+  width: 90%;
+  margin: 0 5%;
 }
-.btn-primary,.btn-done{
-  padding: 10rpx 35rpx;
-  margin-left: 20rpx;
-  border-radius: 30rpx;
-}
-.btn-done{
-  color: #333
+.btn-primary{
+  border-radius: 10rpx;
+  padding: 10rpx 0;
+  margin-top: 80rpx;
+  background: #1AAD19;
+  width: 100%;
+  font-size: 36rpx;
 }
 textarea {
   width: 100%;
 }
+.weui-cells{
+  border:  none;
+}
+
+.star-con{
+  text-align: center;
+  margin: 60rpx 0;
+}
+
+.star-txt{
+  margin-bottom: 30rpx;
+}
+
+.comment_area{
+  background: #fff;
+  padding: 20rpx;
+}

pages/zl_detail/index.wxml

@@ -8,63 +8,57 @@
   <view class='zl_detail_info'>
     <view class='zl_detail_info_title'>
       <text class='exhibitionDetailName'>{{exhibitionDetail.name}}</text>
-      <view class="comment_style">
-        <text>{{exhibitionDetail.score}}</text>
-        <view>
-          <image wx:for="{{_show_star}}" wx:key="index" class="comment-img__item" mode='aspectFill' src="{{item.img}}"></image>
-        </view>
-        <text style='font-size:24rpx;color:#999;font-weight:normal'>{{exhibitionDetail.commentCount}}评论</text>
-      </view>
-    </view>
-    <view class='zl_detail_info_subTxt'>
-      <text class='iconfont icon-time'></text>
-      <text class='zl_detail_info_subTxt_title'>展览时间：</text>
-
-      <view class='zl_detail_info_subTxt_txt'>
-        {{exhibitionDetail.statusTextDesp}}
-
-        <!-- <template is="wxParse" data="{{wxParseData:openTime.nodes}}" /> -->
-      </view>
     </view>
     <view class='zl_detail_info_subTxt'>
-      <text class='iconfont icon-piaowu'></text>
-      <text class='zl_detail_info_subTxt_title'>票务：</text>
-      <text class='zl_detail_info_subTxt_txt'>{{exhibitionDetail.fee||'免费'}}</text>
+      <text class='zl_detail_info_subTxt_txt'>{{exhibitionDetail.pavilionName}}</text>
       <view class="like_style">
-        <text data-idx="{{index}}" data-type="{{exhibitionDetail.hasCollect}}" data-id="{{item.id}}" class="iconfont {{exhibitionDetail.hasCollect?'icon-like':'icon-empty_like'}}" catchtap='addLike'>
+        <text data-idx="{{index}}" data-type="{{exhibitionDetail.hasCollect}}" data-id="{{item.id}}" class="iconfont {{exhibitionDetail.hasCollect?'iconyishoucang':'iconweishoucang'}}" catchtap='addLike'>
         <!-- <text class='like-num'>{{exhibitionDetail.collectionsCount}}</text> -->
         <text class='like-status'>{{exhibitionDetail.hasCollect?'已收藏':'未收藏'}}</text>
         </text>
       </view>
     </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"></view>
+    <view class='cg_detail_time_warpper'>
+      <view class='iconfont iconriqi'></view>
+      <text class='cg_detail_time'>{{exhibitionDetail.openTime}}</text>
+    </view>
+    <view class='cg_detail_time_warpper'>
+      <view class='iconfont iconshijian'></view>
+      <text class='cg_detail_time'>{{exhibitionDetail.statusTextDesp}}</text>
+    </view>
+    <view class='cg_detail_time_warpper'>
+      <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}}">
+      <view class=' iconfont iconweizhi'></view>
+      <text class='cg_address'>{{exhibitionDetail.address}}</text>
+      <view class='iconfont iconkedianjibiaoshiicon'></view>
+    </navigator>
+    <view class='zl_detail_con'>
+      <!-- <template is="wxParse" data="{{wxParseData:description.nodes}}" /> -->
+    </view>
+  </view>
+  <view class='zl_artist' wx:if="{{exhibitionDetail.pavilions.length>0}}">
+    <view class='fdkk-cells'>
+      <view class='artist_avatar'>
+        <view class='artist_avatar_item'>
+          <image class='artist_avatar_img' mode='aspectFill' src="{{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>
         </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-      </navigator>
-      <view class="zl_detail_body {{active?'zl_detail_body_active':''}}">
-        <view class='zl_detail_con'>
-          <template is="wxParse" data="{{wxParseData:description.nodes}}" />
-        </view>
-      </view>
-      <view class='shensuo' bindtap='clickCell'>
-        <text class="iconfont icon-jiantou {{active?'icon-jiantou_active':''}}">{{active?'收起':'展开'}}</text>
+        <text class='iconfont iconkedianjibiaoshiicon'></text>
       </view>
     </view>
   </view>
   <view class='tour_guide'>
-    <view class='fdkk-cells' style='padding: 0;padding-bottom:30rpx'>
+    <view class='fdkk-cells' style='padding: 0;padding-bottom:30rpx;margin-bottom:0;'>
       <view class='weui-cell fix-padding'>
         <view class='weui-cell__bd' style='padding:0 30rpx;'>
           <text class='sub_bar_title'>热门评论</text>
+          <text bindtap='tapToComement' class='write_comment'>写评论</text>
         </view>
       </view>
       <view wx:for="{{comments.content}}" wx:if="{{!(index>2)||readActive}}" wx:key="index" class='comment_con'>
@@ -91,67 +85,12 @@
               <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 class="comment-img" wx:if="{{evaluate[0].imgs.length>0}}">
-              <image wx:for="{{evaluate[0].imgs}}" wx:key="{{index}}" class="comment-img__item" mode='aspectFill' src="{{item}}"></image>
-            </view> -->
           </view>
         </view>
       </view>
       <view class='shensuo' bindtap="{{comments.content.length>0?'tapToCommentDetail':''}}">
-        <text class="" style='color:#e02f2f'>{{comments.content.length>0?"全部评论"+'('+comments.content.length+')':"暂无评论"}}</text>
-      </view>
-    </view>
-  </view>
-  <view class='zl_artist' wx:if="{{exhibitionDetail.artists.length>0}}">
-    <view class='fdkk-cells'>
-      <view class='weui-cell no-border' style='padding-bottom:0'>
-        <view class='weui-cell__bd'>
-          <text class='sub_bar_title'>艺术家</text>
-        </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access {{readActive?'weui-cell__ft_in-access_active':''}}" bindtap='readMore'>全部（{{exhibitionDetail.artists.length}}）</view>
-      </view>
-      <view class='artist_avatar'>
-        <view class='artist_avatar_item' wx:for="{{exhibitionDetail.artists}}" wx:key="index">
-          <image class='artist_avatar_img' mode='aspectFill' src="{{item.imageUrl||defaultImg}}"></image>
-          <text style='text-align:center;margin-top:10rpx;'>{{item.name}}</text>
-        </view>
+        <text class="">{{comments.content.length>0?"查看更多评论"+'('+comments.content.length+')':"没有更多啦"}}</text>
       </view>
     </view>
   </view>
-  <view class='tour_guide' wx:if="{{exhibitionDetail.address||exhibitionDetail.openTime||exhibitionDetail.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="{{exhibitionDetail.longitude&&exhibitionDetail.latitude}}">
-        <map id="map" longitude="{{exhibitionDetail.longitude}}" latitude="{{exhibitionDetail.latitude}}" scale="14" controls="{{controls}}" bindcontroltap="controltap" markers="{{markers}}" bindmarkertap="markertap" polyline="{{polyline}}" 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:15px;'>
-        <view wx:key="index" class='tour_info' wx:if="{{exhibitionDetail.address}}">
-          <view class='tour_info_title'>地址</view>
-          <view class='tour_info_txt'>{{exhibitionDetail.address}}</view>
-        </view>
-        <view wx:key="index" class='tour_info' wx:if="{{exhibitionDetail.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="{{exhibitionDetail.pavilions[0].tel}}">
-          <view class='tour_info_title'>电话</view>
-          <view class='tour_info_txt'>{{exhibitionDetail.pavilions[0].tel}}</view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="bottom-area">
-    <view bindtap='tapToComement' class="bottom-area__info">
-      <text class="iconfont icon-xiugai"></text>
-      <text class='icontxt'>评论</text>
-    </view>
-  </view>
 </view>

pages/zl_detail/index.wxss

@@ -5,16 +5,15 @@
 .container {
   padding: 0;
   background: #eee;
-  padding-bottom:100rpx;
 }
 
 .zl_detail_bg {
-  height: 440rpx;
+  height: 540rpx;
 }
 
 .zl_detail_bg_img {
   width: 100%;
-  height: 440rpx;
+  height: 540rpx;
 }
 
 .zl_detail_info {
@@ -31,7 +30,7 @@
 
 .zl_detail_info_subTxt {
   line-height: 40rpx;
-  margin-bottom: 20rpx;
+  margin-bottom: 60rpx;
   display: flex;
 }
 
@@ -55,6 +54,10 @@
   width: 400rpx;
 }
 
+.like_style .iconfont{
+  font-size: 28rpx;
+}
+
 .weui-cell {
   padding: 20rpx 0 40rpx;
   border-bottom: 2rpx #ddd solid;
@@ -88,7 +91,7 @@
 .fdkk-cells {
   background: #fff;
   margin: 20rpx 0;
-  padding: 0 30rpx 20rpx;
+  padding: 40rpx 30rpx;
 }
 
 .sub_bar_title {
@@ -104,26 +107,27 @@
 .artist_avatar {
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-around;
+  justify-content: space-between;
+  align-items: center;
 }
 
 .artist_avatar_item {
   display: flex;
-  flex-direction: column;
-  padding: 30rpx 40rpx 0;
+  align-items: center;
 }
 
 .artist_avatar_img {
-  min-width: 140rpx;
-  width: 140rpx;
-  height: 140rpx;
-  /* border-radius: 70rpx; */
+  min-width: 80rpx;
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
   margin: 0 auto;
 }
 
 .fix-padding {
-   padding-bottom: 20rpx; 
+   padding: 60rpx 0 50rpx; 
    border-bottom:0;
+   
 }
 
 .tour_map {
@@ -198,7 +202,7 @@
 }
 
 .like-status {
-  margin-left: 4rpx;
+  margin-left: 18rpx;
   font-size: 28rpx;
 }
 
@@ -210,7 +214,6 @@
   display: inline-block;
   position: absolute;
   right: 40rpx;
-
 }
 
 .detail_title {
@@ -241,3 +244,68 @@
 .icon-zan_active{
   color: #e02f2f
 }
+
+
+.cg_detail_time{
+  font-size: 26rpx;
+  width: 100%;
+  overflow:hidden;
+  text-overflow:ellipsis;
+}
+.cg_detail_warpper{
+  margin-top: 40rpx;
+}
+.cg_address_warpper,.cg_detail_time_warpper{
+  display: flex;
+  align-items: center;
+  margin: 30rpx 0;
+}
+.cg_address_warpper{
+  margin-bottom: 100rpx;
+}
+
+.cg_detail_time_warpper .iconfont,.cg_address_warpper .iconfont{
+  color: #000;
+  font-size: 28rpx;
+  display: inline-block;
+  vertical-align: text-bottom;
+  font-weight: bold;
+  margin-right: 36rpx;
+}
+
+.cg_address, .iconkedianjibiaoshiicon{
+  color: #e02f2f!important;
+}
+
+.iconkedianjibiaoshiicon{
+  margin-left: 16rpx!important;
+  font-size: 22rpx!important;
+}
+
+.zl_detail_con{
+  margin-bottom: 40rpx;
+}
+
+.pav_item{
+  margin-left: 40rpx;
+}
+
+.cg_desc{
+  font-size: 24rpx;
+  color: #646464;
+}
+.pav_name{
+  font-size: 30rpx;
+  color: #000;
+  font-weight: bold;
+}
+
+.artist_avatar .iconkedianjibiaoshiicon{
+  color: #000!important;
+}
+
+.write_comment{
+  float: right;
+  color: #e02f2f;
+  font-size: 28rpx;
+}

project.config.json

@@ -1,17 +1,18 @@
 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
-		"nodeModules": false
+		"nodeModules": false,
+		"autoAudits": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.3",
 	"appid": "wx0e75c90d9db2047b",
-	"projectname": "wxApp-4dkk",
+	"projectname": "Small_Program",
 	"isGameTourist": false,
 	"condition": {
 		"search": {
@@ -31,7 +32,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,
@@ -42,8 +43,9 @@
 				{
 					"id": 1,
 					"name": "reward-detail",
-					"pathName": "pages/user/reward_detail/index",
-					"query": ""
+					"pathName": "pages/user/my_follow/index",
+					"query": "",
+					"scene": null
 				},
 				{
 					"id": 2,
@@ -61,20 +63,22 @@
 				{
 					"id": 4,
 					"name": "rewas",
-					"pathName": "pages/cg_detail/index",
-					"query": ""
+					"pathName": "pages/zl_detail/create_evaluation/index",
+					"query": "",
+					"scene": null
 				},
 				{
 					"id": 5,
 					"name": "test",
-					"pathName": "pages/wv_page/index",
-					"query": ""
+					"pathName": "pages/tongcheng/index",
+					"query": "",
+					"scene": null
 				},
 				{
-					"id": 7,
-					"name": "cg_detail",
-					"pathName": "pages/cg_detail/index",
-					"query": "id=14098",
+					"id": 6,
+					"name": "线下看展",
+					"pathName": "pages/zl_detail/index",
+					"query": "id=6158",
 					"scene": null
 				}
 			]

utils/services.js

@@ -2,8 +2,8 @@ const {
   Toast
 } = require('./util');
 
-const serverName = 'https://www.4dmuseum.cn'; // 正式
-// const serverName = 'http://192.168.0.60:8080'; // 本地
+// const serverName = 'https://www.4dmuseum.cn'; // 正式
+const serverName = 'http://192.168.0.100:8081'; // 本地
 
 
 const urls = {
@@ -22,6 +22,7 @@ const urls = {
 
   //展会
   getExhibitionList: "/wx/api/exhibition/listByType",
+  getExhibitionListOffline: "/wx/api/exhibition/offline",
   getExhibitionDetail: "/wx/api/exhibition/detail",
   getExhibitionSearch: "/wx/api/exhibition/search",
   getKeywordCode: "/wx/api/dataDictionary/keywordCode",

utils/util.js

@@ -1,3 +1,5 @@
+const QQMapWX = require('../common/component/mapSDK/qqmap-wx-jssdk.min.js');
+
 var regChar = { //非特殊字符作为值
   '?':'qweqwqjoijweq',
   '&':'asdauihdasfsdas',
@@ -202,4 +204,7 @@ module.exports = {
   encodeParam,
   decodeParam,
   Toast: new Toast(),
+  qqmapsdk: new QQMapWX({
+    key: '2Z3BZ-H7EWO-F4YWX-SG5JF-2VOK2-S2FUB'
+  })
 };