tremble 2 年之前
父节点
当前提交
8776f321d4

+ 4 - 2
app.json

@@ -25,7 +25,8 @@
     "pages/login_page/index",
     "common/components/drop-down/index",
     "pages/user/my_contact/index",
-    "common/components/component-list/component-list"
+    "common/components/component-list/component-list",
+    "pages/yuezhan/html_detail/index"
   ],
   "window": {
     "backgroundTextStyle": "dark",
@@ -72,5 +73,6 @@
     "scope.userLocation": {
       "desc": "获取地理位置以便获得当前城市的展览"
     }
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }

+ 2 - 2
app.wxss

@@ -34,7 +34,7 @@ html, body, page {
 
 
 .fdkz-card-img {
-  height: 360rpx;
+  height: 388rpx;
   border-radius: 15rpx;
   overflow: hidden;
 }
@@ -46,7 +46,7 @@ html, body, page {
 .fdkz-card-info-title {
   display: flex;
   align-items: center;
-  margin-top: 20rpx;
+  margin-top: 40rpx;
   font-size: 36rpx;
   font-weight: bold;
 }

+ 2 - 2
common/component/wxParse/wxParse.wxss

@@ -205,6 +205,6 @@ view{
 .wxParse-figure {
   overflow: hidden;
 }
- image{
-  width: 100%;
+.wxParse-p image{
+  width: 100%!important;
 } 

+ 2 - 2
common/component/wxStar/wxStar/wxStar.wxss

@@ -18,10 +18,10 @@
   position: absolute;
   top: 0;
   right: 0;
-  left: 50%;
+  left: 0;
   bottom: 0;
   overflow: hidden;
-  text-indent: -50%;
+  /* text-indent: -50%; */
 }
 .wx-star .wx-star-checked{
   color: #eab82d;

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

@@ -53,7 +53,7 @@ Component({
       if (this.data.hasProduct){
         app.globalData.currentUrl = this.data.link
         wx.navigateTo({
-          url: `../../wv_page/index?link=${escape(this.data.link)}`,
+          url: `../../wv_page/index?id=${this.data.sceneId}`,
           success: function (res) { },
           fail: function (res) { },
           complete: function (res) { },

+ 2 - 0
pages/cg_detail/index.wxss

@@ -30,6 +30,7 @@
   height: 82rpx;
   border-radius: 50%;
   border: 1px solid #ccc;
+  display: inline-block;
   overflow: hidden;
 }
 .cg_detail_info_top_flex {
@@ -117,6 +118,7 @@
 }
 
 .cg_detail_info_top_flex_img {
+  width: 100%;
   height: 100%;
   display: block;
 }

+ 0 - 23
pages/swkz/index.js

@@ -35,7 +35,6 @@ Page({
 
   loadMore: function () {
     if (!this.data.lastPage) {
-      console.log(this.data.currentPage + 1)
       this.getList(this.data.currentPage + 1);
     } else {
       return;
@@ -45,7 +44,6 @@ Page({
   onReachBottom: function () {
     if (!this.data.loading) {
       this.loadMore();
-      console.log('reach Bottom');
     }
 
   },
@@ -62,7 +60,6 @@ Page({
     // });
     // this.getBanner();
     // this.getList(1);
-    console.log('dwdwasda',collectedChange)
     if (collectedChange) {
       for (let i = 0; i < exhibitionList.length; i++) {
         for (let j = 0; j < collectedArr.length; j++) {
@@ -79,7 +76,6 @@ Page({
             }
           }
         }
-        // console.log(collectedArr.status, collectedArr.collectedId)
 
       }
       this.setData({
@@ -108,7 +104,6 @@ Page({
 
   getList: function (page) {
     let type = this.data.tag;
-    console.log(this.data.tag)
     this.setData({
       loading: true
     })
@@ -127,14 +122,12 @@ Page({
         currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
         currentValue.product ? currentValue.product.imageUrl = escape(currentValue.product.imageUrl) : '';
       })
-      console.log(res)
       this.setData({
         currentPage: res.data.data.number + 1,
         lastPage,
         loading: false,
         exhibitionList: tempContent.concat(exhibitionList),
       });
-      console.log(exhibitionList)
       wx.stopPullDownRefresh();
 
       // WxParse.wxParseTemArray("replyTemArray", 'reply', replyArr.length, that)
@@ -148,15 +141,12 @@ Page({
 
   addLike: function (e) {
     let { type, id, idx } = e.currentTarget.dataset;
-    console.log(idx, type, id)
 
     let likes = this.data.likes;
     likes[id] = !likes[id];
     let exhibitionList = this.data.exhibitionList;
     let { collectedArr, collectedChange } = app.globalData, hasItem = true;
 
-
-    console.log('type', type)
     this.setData({
       likes: likes
     })
@@ -172,7 +162,6 @@ Page({
       if (res.data.code > -1) {
         for (let i = 0; i < collectedArr.length; i++) {
           if (collectedArr[i].collectedId && id == collectedArr[i].collectedId) {
-            console.log("true")
             collectedArr[i] = {
               collectedId: id,
               status: res.data.data.hasCollect,
@@ -204,7 +193,6 @@ Page({
     })
     // }
 
-    console.log(this.data.exhibitionList)
   },
 
   to_search: function () {
@@ -216,15 +204,4 @@ Page({
     })
   },
 
-
-  to_pay: function (e) {
-    console.log(e)
-    let url = e.currentTarget.dataset.url
-    wx.navigateTo({
-      url: `../wv_page/index?url=${url}`,
-      success: function (res) { },
-      fail: function (res) { },
-      complete: function (res) { },
-    })
-  }
 })

+ 1 - 1
pages/swkz/index.wxml

@@ -1,6 +1,6 @@
 <!--index.wxml-->
 <view class='container'>
- <navigator hover-class='none' url="{{item.hasProduct ?('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl) : ('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
+ <navigator hover-class='none' url="{{item.hasProduct ?('../wv_page/index?&id='+item.id) : ('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
     <view class='fdkz-card-img'>
       <view class="new-fdkz-card-tag ">
         <text class='fdkz-card-tag-txt'>线上看展</text>

+ 1 - 28
pages/tongcheng/index.js

@@ -90,7 +90,6 @@ Page({
       defaultImg,
       imgServer
     });
-    console.log(this.data)
   },
   onShareAppMessage: function () {
 
@@ -99,7 +98,6 @@ Page({
     let { city, clickToSelect, collectedArr, collectedChange } = app.globalData;
     let { activeIndex, exhibitionList } = this.data
     if (clickToSelect) {
-      // console.log(city)
       this.setData({
         locationName: city || "珠海",
         exhibitionList: [],
@@ -131,7 +129,6 @@ Page({
             }
           }
         }
-        // console.log(collectedArr.status, collectedArr.collectedId)
 
       }
       this.setData({
@@ -144,13 +141,11 @@ Page({
 
   addLike: function (e) {
     let { type, id, idx } = e.currentTarget.dataset;
-    console.log(idx, type, id)
 
     let exhibitionList = this.data.exhibitionList;
     let { collectedArr, collectedChange } = app.globalData, hasItem = true;
 
 
-    console.log('type', type)
 
     Toast.showToast2('loading');
 
@@ -164,7 +159,6 @@ Page({
       if (res.data.code > -1) {
         for (let i = 0; i < collectedArr.length; i++) {
           if (collectedArr[i].collectedId && id == collectedArr[i].collectedId) {
-            console.log("true")
             collectedArr[i] = {
               collectedId: id,
               status: res.data.data.hasCollect,
@@ -196,14 +190,11 @@ Page({
     })
     // }
 
-    console.log(this.data.exhibitionList)
   },
 
   showDrop: function (e) {
     let tag = e.target.dataset.id
-    console.log(e)
     let name = e.target.dataset.test
-    console.log(tag)
     if (tag==='type'){
       this.setData({
         navItem: {
@@ -244,7 +235,6 @@ Page({
           success: (res) => {
             let { city: locationName } = res.result.address_component;
             locationName = locationName.substring(0, 2);
-            console.log(locationName);
             app.globalData.city = locationName;
 
             this.setData({
@@ -254,13 +244,11 @@ Page({
             this.getList(1)
           },
           fail: function (res) {
-            console.log(res)
             this.setData({
               locationName: ""
             })
           },
           complete: function (res) {
-            console.log(res);
           }
         });
       }
@@ -285,7 +273,6 @@ Page({
       this.setData({
         ExhibitionPopular: res.data.data
       })
-      console.log(this.data.ExhibitionPopular)
     }, err => {
 
     }, complete => {
@@ -298,11 +285,7 @@ Page({
     let loginSessionKey = wx.getStorageSync("token");
     let sort = distItems.find(item => item.id === activeDist).idx
     let type = typeItems.find(item => item.id === activeType).idx
-    console.log(sort, type)
-    console.log(page)
-    console.log(type, locationName, latitude, longitude);
-    console.log(locationNameDesp)
-
+    
     this.setData({
       loading: true
     })
@@ -334,8 +317,6 @@ Page({
         exhibitionList: tempContent.concat(exhibitionList),
         exhiNum: totalElements
       });
-      console.log(this.data.exhibitionList)
-      console.log(res.data.data)
       wx.stopPullDownRefresh();
       // WxParse.wxParseTemArray("replyTemArray", 'reply', replyArr.length, that)
 
@@ -388,7 +369,6 @@ Page({
                   let { last: lastPage, totalPages, content: exhibitionList } = res.data.data;
 
                   let { openTime } = exhibitionList;
-                  console.log(res)
                   this.setData({
                     currentPage: res.data.data.number + 1,
                     lastPage,
@@ -397,7 +377,6 @@ Page({
                     latitude,
                     exhibitionList: tempContent.concat(exhibitionList),
                   });
-                  console.log(exhibitionList)
                   wx.stopPullDownRefresh();
 
                   // WxParse.wxParseTemArray("replyTemArray", 'reply', replyArr.length, that)
@@ -424,14 +403,12 @@ Page({
               let { last: lastPage, totalPages, 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),
               });
-              console.log(exhibitionList)
               wx.stopPullDownRefresh();
             }, err => {
             }, complete => {
@@ -453,7 +430,6 @@ Page({
   loadMore: function () {
     let { activeIndex } = this.data
     if (!this.data.lastPage) {
-      console.log(this.data.currentPage + 1)
       if (activeIndex == 1) {
         this.getNearByList(this.data.currentPage + 1);
       }
@@ -468,13 +444,11 @@ Page({
   onReachBottom: function () {
     if (!this.data.loading) {
       this.loadMore();
-      console.log('reach Bottom');
     }
 
   },
 
   tabClick: function (e) {
-    // console.log(e.currentTarget.dataset)
     this.setData({
       exhibitionList: [],
       activeIndex: e.currentTarget.id,
@@ -496,7 +470,6 @@ Page({
   },
 
   getActiveItem:function(e){
-    console.log(e)
     let { activeDist, activeType} = e.detail
     
     this.setData({

+ 2 - 21
pages/user/index.js

@@ -94,10 +94,6 @@ Page({
       }
     })
 
-    this.setData({
-      requestTask
-    })
-
   },
 
   tapByIdx: function(e) {
@@ -190,7 +186,6 @@ Page({
   _isLogin: function() {
     if (wx.getStorageSync('token')) {
       let loginSessionKey = wx.getStorageSync("token");
-      console.log(loginSessionKey)
       if (loginSessionKey != " ") {
         wx.checkSession({
           success: res => {
@@ -217,10 +212,7 @@ Page({
                     avatarUrl: ""
                   })
                   app.globalData.isLogin = false;
-                  let {
-                    requestTask
-                  } = this.data;
-                  requestTask.abort();
+                  
                 }
               }
             })
@@ -245,10 +237,7 @@ Page({
 
             })
             app.globalData.isLogin = false;
-            let {
-              requestTask
-            } = this.data;
-            requestTask.abort();
+            
           }
         })
       } else {
@@ -274,7 +263,6 @@ Page({
 
 
   _getUserInfoToLogin: function(e) {
-    console.log(e);
     Toast.showToast2('loading');
 
     if (e.detail.encryptedData) {
@@ -317,8 +305,6 @@ Page({
                     loginSessionKey
                   } = res.data.data;
                   wx.setStorageSync('token', loginSessionKey)
-                  this.isLongPolling();
-                  console.log(loginSessionKey)
                 }
                 else{
                   Toast.showToast('warn', '登录失败,请重试');
@@ -406,10 +392,6 @@ Page({
         loginSessionKey
       }, "post", res => {
         if (res.data.code > -1) {
-          let {
-            requestTask
-          } = this.data
-
           wx.setStorageSync('userInfo', null);
           wx.setStorageSync('token', null);
           console.log(wx.getStorageSync('token'))
@@ -418,7 +400,6 @@ Page({
             avatarUrl: ""
           })
           app.globalData.isLogin = false;
-          requestTask.abort();
         }
 
       }, err => {

+ 0 - 1
pages/user/my_saw/index.js

@@ -166,7 +166,6 @@ Page({
     // });
     // this.getBanner();
     // this.getList(1);
-    console.log('dwdwasda', isLogin)
     this.setData({
       isLogin
     })

+ 0 - 31
pages/user/my_saw/index.wxml

@@ -1,40 +1,9 @@
 <!--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">
-          <!-- <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>
-      </view>
-      <image src="{{item.imageUrl||defaultImg}}" mode="aspectFill" class='item-img'></image>
-    </view>
-    <view class='fdkz-card-info'>
-      <view class='fdkz-card-info-title'>
-        <view class='title-txt'>
-          {{item.name}}
-        </view>
-        <image wx:if="{{item.hasProduct}}" mode='widthFix' class='fdkzImg' src='{{testImg}}'></image>
-      </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  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> -->
         <view class='componentList'>
           <block wx:for="{{myBrowsed}}" wx:key="index">
             <component-list

+ 30 - 61
pages/wv_page/index.js

@@ -1,6 +1,6 @@
 // pages/wv_page/index.js
 const { encodeParam, decodeParam, recordAccess } = require('../../utils/util.js');
-const { serverName } = require('../../utils/services');
+const { serverName, request } = require('../../utils/services');
 
 const app = getApp();
 
@@ -17,24 +17,14 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    recordAccess(options)
-    console.log(options)
-    let { link: url, imageUrl,id:sceneId } = options;
-    this.setData({
-      url: unescape(options.link),
-      imageUrl,
-      sceneId
+    let id = (options.scene && decodeURIComponent(options.scene))|| options.id
+    recordAccess({
+      id
     })
 
-
-    // console.log('isShare', isShare)
-    
-    // console.log('url', encodeParam(url))
-    // console.log('url', decodeParam(encodeParam(url)))
-    
-    
-    // let url = wx.getStorageSync('url')
-    //记录
+    if (id){
+      this.getExhibitionDetail(id)
+    }
   },
 
   forward: function(url){
@@ -43,57 +33,36 @@ Page({
     })
   },
   
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-    
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
+  getExhibitionDetail: function (sceneId) {
+    let exhibitionId = sceneId
+    request["getExhibitionDetail"]({
+      exhibitionId: exhibitionId
+    }, "", res => {
+      let { data: exhibitionDetail } = res.data;
+      let { product } = exhibitionDetail
+      this.setData({
+        url: product.showLink,
+        imageUrl: exhibitionDetail.imageUrl,
+        relayUrl: exhibitionDetail.relayUrl,
+        sceneId: exhibitionDetail.id
+      })
+      if (exhibitionDetail.name) {
+        wx.setNavigationBarTitle({
+          title: exhibitionDetail.name
+        })
+      }
+    })
   },
 
   /**
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-    let { url, id, imageUrl, forwardImg} = this.data;
+    let {sceneId, imageUrl, relayUrl, forwardImg} = this.data;
     console.log(imageUrl || forwardImg)
     return {
-      path: `/pages/wv_page/index?isShare=1&link=${escape(url)}&id=${id}`,
-      imageUrl: imageUrl || forwardImg
+      path: `/pages/wv_page/index?&id=${sceneId}`,
+      imageUrl: relayUrl || imageUrl || forwardImg
     }
   }
-})
+})

+ 1 - 1
pages/wv_page/index.wxml

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

+ 102 - 0
pages/yuezhan/html_detail/index.js

@@ -0,0 +1,102 @@
+// pages/yuezhan/html_detail/index.js.js
+const WxParse = require('../../../common/component/wxParse/wxParse.js');
+const { recordAccess } = require('../../../utils/util.js');
+const { serverName, request } = require('../../../utils/services');
+
+const app = getApp();
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    forwardImg: 'https://4dscene.4dage.com/cgaii/images/join/forwardImg.jpg'
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    recordAccess(options)
+    console.log(options)
+    let { imageUrl, relayUrl, id: sceneId, isShare } = options;
+    this.setData({
+      imageUrl,
+      relayUrl,
+      sceneId
+    })
+    let {
+      bannerHtml
+    } = app.globalData
+
+    if (isShare){
+      this.getHtml()
+    }else{
+      WxParse.wxParse('description', 'html', bannerHtml, this, 5);
+    }
+
+  },
+
+  getHtml:function(){
+    let {sceneId} =  this.data
+    request["getBannerDetail"]({
+      bannerId: sceneId
+    }, "", res => {
+      let { description} = res.data.data
+      WxParse.wxParse('description', 'html', description, this, 5);
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    let { sceneId, imageUrl, relayUrl, forwardImg } = this.data;
+    return {
+      path: `/pages/yuezhan/html_detail/index?id=${sceneId}&isShare=1&imageUrl=${imageUrl}&relayUrl=${relayUrl}`,
+      imageUrl: relayUrl || imageUrl || forwardImg
+    }
+  }
+})

+ 3 - 0
pages/yuezhan/html_detail/index.json

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

+ 5 - 0
pages/yuezhan/html_detail/index.wxml

@@ -0,0 +1,5 @@
+<!--pages/yuezhan/html_detail/index.js.wxml-->
+<import src="../../../common/component/wxParse/wxParse.wxml" />
+<view class='html_con'>
+  <template is="wxParse" data="{{wxParseData:description.nodes}}" />
+</view>

+ 7 - 0
pages/yuezhan/html_detail/index.wxss

@@ -0,0 +1,7 @@
+/* pages/yuezhan/html_detail/index.js.wxss */
+@import "../../../common/component/wxParse/wxParse.wxss";
+
+.html_con{
+  padding: 20rpx 30rpx;
+}
+

+ 29 - 33
pages/yuezhan/index.js

@@ -9,7 +9,8 @@ const {
 } = require('../../utils/util.js');
 const {
   defaultImg,
-  noExhibitionImg
+  noExhibitionImg,
+  closeImg
 } = require('../../utils/images');
 
 
@@ -35,7 +36,8 @@ Page({
     likes: {},
     tag: 0,
     latitude: null,
-    longitude: null
+    longitude: null,
+    showRecommend:false
   },
 
   onLoad: function() {
@@ -43,12 +45,15 @@ Page({
       serverName,
       defaultImg,
       noExhibitionImg,
-      imgServer
+      imgServer,
+      closeImg,
+      showRecommend:true
       // isLogin
     })
 
     this.getBanner();
     this.getList(1);
+    wx.hideTabBar()
   },
 
   loadMore: function() {
@@ -112,9 +117,17 @@ Page({
       exhibitionList: [],
       currentPage: 1
     });
+    this.getBanner();
     this.getList(1);
   },
 
+  hideRecommend:function(){
+    this.setData({
+      showRecommend:false
+    })
+    wx.showTabBar()
+  },
+
   fetchData: function (page){
     request["getExhibitionList"]({
       page: page,
@@ -307,10 +320,10 @@ Page({
       haspay,
       productlink,
       id,
-      imageurl
+      description,
+      imageurl,
+      relayUrl
     } = e.currentTarget.dataset;
-    console.log(e.currentTarget.dataset)
-    console.log(imageurl)
 
 
     // app.globalData.currentUrl = url
@@ -340,7 +353,7 @@ Page({
           case 1:
             if (hasproduct) {
               wx.navigateTo({
-                url: `../wv_page/index?link=${escape(productlink)}&id=${id}&imageUrl=${imageurl}`,
+                url: `../wv_page/index?&id=${url}`,
                 success: function(res) {},
                 fail: function(res) {},
                 complete: function(res) {},
@@ -359,34 +372,17 @@ Page({
             break;
         }
         break;
+      case 2:
+        app.globalData.bannerHtml = description;
+        wx.navigateTo({
+          url: `./html_detail/index?id=${id}&imageUrl=${imageurl}&relayUrl=${relayUrl||''}`,
+          success: function (res) { },
+          fail: function (res) { },
+          complete: function (res) { },
+        })
+        break;
       default:
         break;
     }
-
-    // let { url } = e.currentTarget.dataset;
-
-
-    // app.globalData.currentUrl = url
-    // console.log('dwdwdw', app.globalData.currentUrl)
-
-    // // console.log('dwdwdwd',wx.getStorageSync('url'))
-
-    // if (String(url).indexOf('http')>-1){
-    //   wx.navigateTo({
-    //     url: `../wv_page/index`,
-    //     success: function (res) { },
-    //     fail: function (res) { },
-    //     complete: function (res) { },
-    //   })    
-    // }else{
-    //   wx.navigateTo({
-    //     url: `../zl_detail/index?id=${url}`,
-    //     success: function (res) { },
-    //     fail: function (res) { },
-    //     complete: function (res) { },
-    //   })  
-    // }
-
-
   }
 })

+ 23 - 7
pages/yuezhan/index.wxml

@@ -15,17 +15,15 @@
     </view>
   </view>
   <swiper wx:if="{{commodityImgs.length>0}}" class='swiper-style' circular="true" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
-    <swiper-item  wx:for="{{commodityImgs}}" bindtap='to_pay' data-pageType="{{item.pageType}}" data-urlType="{{item.urlType}}" data-hasProduct="{{item.hasProduct}}" data-hasPay="{{item.hasPay}}" data-imageUrl="{{item.imageUrl}}" data-url="{{item.url}}" data-id="{{item.id}}" wx:key="{{item.id}}"   data-productLink="{{item.productLink}}" >
+    <swiper-item wx:for="{{commodityImgs}}" bindtap='to_pay' data-description="{{item.description}}" data-pageType="{{item.pageType}}" data-urlType="{{item.urlType}}" data-hasProduct="{{item.hasProduct}}" data-hasPay="{{item.hasPay}}" data-imageUrl="{{item.imageUrl}}" data-relayUrl='{{relayUrl}}' data-url="{{item.url}}" data-id="{{item.id}}" wx:key="{{item.id}}" data-productLink="{{item.productLink}}">
       <image mode="aspectFill" src="{{imgServer+item.imageUrl||defaultImg}}" class="yuezhan-img" />
     </swiper-item>
   </swiper>
   <view class='yuezhan-navigator'>
     <view class='navigator-title'>推荐展览</view>
-    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl):('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'  >
+    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link+'&id='+item.id+'&imageUrl='+item.imageUrl):('../zl_detail/index?id='+item.id+'&imageUrl='+item.imageUrl)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
       <view class='fdkz-card-img'>
-
-        <view wx:if="{{item.statusText}}" 
-        class="{{item.online == 1 ? 'new-fdkz-card-tag' : 'fdkz-card-tag'}}  {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag-end':item.statusText=='热门'?'':'fdkz-card-tag_coming'}}">
+        <view wx:if="{{item.statusText||item.online}}" class="{{item.online == 1 ? 'new-fdkz-card-tag' : 'fdkz-card-tag'}}  {{item.statusText=='展览中'||item.statusText==''?'':item.statusText=='已结束'?'fdkz-card-tag-end':item.statusText=='热门'?'':'fdkz-card-tag_coming'}}">
           <text class='fdkz-card-tag-txt'>{{item.online == 1 ? '线上看展' : item.statusText}}</text>
         </view>
 
@@ -52,9 +50,9 @@
           <!-- <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 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  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>
@@ -71,4 +69,22 @@
       暂无展会信息
     </view>
   </view>
+
+  <view class="recommend" wx:if="{{showRecommend}}">
+    <view class="recommendcon">
+      <swiper class="sw" wx:if="{{commodityImgs.length>0}}" circular="true" autoplay="{{false}}" interval="{{interval}}" duration="{{duration}}">
+        <swiper-item class="sw-item" wx:for="{{commodityImgs}}" bindtap='to_pay' data-description="{{item.description}}" data-pageType="{{item.pageType}}" data-urlType="{{item.urlType}}" data-hasProduct="{{item.hasProduct}}" data-hasPay="{{item.hasPay}}" data-imageUrl="{{item.imageUrl}}" data-relayUrl='{{relayUrl}}' data-url="{{item.url}}" data-id="{{item.id}}" wx:key="{{item.id}}" data-productLink="{{item.productLink}}">
+          <view class="sw-itemcon">
+            <image mode="aspectFill" src="{{imgServer+item.imageUrl||defaultImg}}" class="cover" />
+            <view class="info">
+              <view>叙利亚古代文物精品展 <text class="tag fdkz-card-tag">精品</text></view>
+              <text class="exhibition">国家典籍博物馆</text>
+            </view>
+            <view class="go_view">去看展</view>
+          </view>
+        </swiper-item>
+      </swiper>
+      <image bindtap="hideRecommend" class="close" src="{{closeImg}}" mode="aspectFill" />
+    </view>
+  </view>
 </view>

+ 90 - 1
pages/yuezhan/index.wxss

@@ -48,7 +48,7 @@
 }
 
 .swiper-style {
-  height: 422rpx;
+  height: 440rpx;
   width: 100%;
   overflow: hidden;
 
@@ -120,3 +120,92 @@
   font-weight: bold;
   padding: 40rpx 0 30rpx 0;
 }
+
+.recommend{
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background: rgba(0,0,0,0.6);
+}
+
+.recommendcon{
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 100%;
+  transform: translate(-50%,-50%);
+  text-align: center;
+}
+
+.recommendcon .sw{
+  font-size: 0;
+  text-align: left;
+  min-height: 60vh;
+  width: 100%;
+}
+.recommendcon .sw-item{
+  width: 100%;
+}
+
+.recommendcon .sw-item .sw-itemcon{
+  background: #fff;
+  border-radius: 30rpx;
+  overflow: hidden;
+  width: 90%;
+  margin: 0 auto;
+}
+
+
+.recommendcon  .info{
+  padding: 20rpx;
+  font-size: 32rpx;
+}
+
+.recommendcon  .info > view{
+  font-weight: bold;
+  font-size: 36rpx;
+  position: relative;
+}
+
+.recommendcon  .info > text{
+  font-size: 28rpx;
+  color: #646464;
+  margin-top: 10rpx;
+}
+
+.recommendcon  .info > view > .tag{
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  top: unset;
+  color: #fff;
+  background-color: #FF7614;
+  font-weight: normal;
+}
+
+
+.recommendcon  .go_view{
+  width: 80%;
+  height: 100rpx;
+  background: #CE4038;
+  border-radius: 10rpx;
+  font-size: 32rpx;
+  line-height: 100rpx;
+  text-align: center;
+  color: #fff;
+  margin: 100rpx auto 60rpx;
+}
+
+.recommendcon .cover{
+  width: 100%;
+  height: 450rpx;
+}
+
+.recommendcon  .close{
+  width: 100rpx;
+  height: 100rpx;
+  margin-top: 40rpx;
+}

+ 0 - 2
pages/yuezhan/pay_page/index.js

@@ -404,7 +404,6 @@ Page({
               nonceStr,
               signType,
               paySign)
-
             // prettier-ignore
             wx.requestPayment({
               timeStamp,
@@ -426,7 +425,6 @@ Page({
               fail: err => {
                 console.log(err);
                 Toast.showToast2('warn', '支付取消');
-
               }
             });
           })

+ 0 - 2
pages/yuezhan/pay_page/index.wxml

@@ -15,7 +15,6 @@
         </view>
         <!-- <text style='font-size:24rpx;color:#999;font-weight:normal'>{{exhibitionDetail.commentCount}}评论</text> -->
         <text style='font-size:24rpx;color:#999;font-weight:normal'>点评</text>
-
       </view>
     </view>
     <view class='zl_detail_info_subTxt'>
@@ -126,7 +125,6 @@
       <!-- <text class="iconfont icon-view"></text> -->
 
       <text class='icontxt'>{{exhibitionDetail.hasPay||!exhibitionDetail.product.productPrice?'观看':'购买'}}</text>
-
     </view>
   </view>
 </view>

+ 0 - 3
pages/yuezhan/search_result/index.js

@@ -307,8 +307,6 @@ Page({
       })
 
       this.loadData();
-      console.log(e.currentTarget.id)
-
   },
 
   /**
@@ -332,7 +330,6 @@ Page({
     // });
     // this.getBanner();
     // this.getList(1);
-    console.log('dwdwasda', isLogin)
     this.setData({
       isLogin
     })

+ 2 - 2
pages/yuezhan/search_result/index.wxml

@@ -32,7 +32,7 @@
   <view class='search-container' hidden="{{activeIndex!=0}}">
     <view class="weui-tab__panel">
       <block wx:for="{{exhibitionList}}" wx:key="index">
-        <navigator hover-class='none' url="{{item.hasProduct ? ('../../wv_page/index?link='+item.product.link+'&id='+item.id):('../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
+        <navigator hover-class='none' url="{{item.hasProduct ? ('../../wv_page/index?id='+item.id):('../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
           <view class="fdkk-cells">
             <view class="weui-panel__bd">
               <view class="weui-media-box weui-media-box_appmsg">
@@ -132,7 +132,7 @@
           <text wx:for="{{keyword}}" wx:key="index" bindtap='keywordSearch' data-keyword='{{item.dataValue}}' class='hot-tag-item'>{{item.dataValue}}</text>
         </view> -->
           <block wx:for="{{ExhibitionPopular}}" wx:key="index">
-            <navigator hover-class='none' url="{{item.hasProduct ? ('../../wv_page/index?link='+item.product.link+'&id='+item.id):('../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
+            <navigator hover-class='none' url="{{item.hasProduct ? ('../../wv_page/index?&id='+item.id):('../../zl_detail/index?id='+item.id)}}" class='weui-tab__content_item'>
               <view class="fdkk-cells">
                 <view class="weui-panel__bd">
                   <view class="weui-media-box weui-media-box_appmsg">

+ 5 - 3
pages/zl_detail/index.js

@@ -109,7 +109,6 @@ Page({
     let {
       exhibitionId
     } = this.data;
-    console.log('detail')
     wx.navigateTo({
       // url: `../../zl_detail/create_evaluation/index?id=${exhibitionId}`,
 
@@ -349,7 +348,11 @@ Page({
       WxParse.wxParse('description', 'html', description, this, 5);
       WxParse.wxParse('openTime', 'html', openTime, this, 5);
       
-
+      if (exhibitionDetail.name){
+        wx.setNavigationBarTitle({
+          title: exhibitionDetail.name
+        })
+      }
     })
   },
 
@@ -365,7 +368,6 @@ Page({
    */
   onShow: function () {
     this.getExhibitionDetail();
-    
   },
 
   /**

+ 3 - 3
pages/zl_detail/index.wxss

@@ -8,16 +8,16 @@
 }
 
 .zl_detail_bg {
-  height: 540rpx;
+  height: 440rpx;
 }
 
 .zl_detail_bg_img {
   width: 100%;
-  height: 540rpx;
+  height: 100%;
 }
 
 .zl_detail_info {
-  padding: 30rpx 30rpx 0rpx 30rpx;
+  padding: 32rpx 30rpx 0rpx 30rpx;
   background: #fff;
 }
 

+ 140 - 134
project.config.json

@@ -1,136 +1,142 @@
 {
-	"description": "项目配置文件。",
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"postcss": true,
-		"minified": true,
-		"newFeature": true,
-		"nodeModules": false,
-		"autoAudits": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.4.3",
-	"appid": "wx0e75c90d9db2047b",
-	"projectname": "Small_Program",
-	"isGameTourist": false,
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": 13,
-			"list": [
-				{
-					"id": 0,
-					"name": "test",
-					"pathName": "pages/login_page/index",
-					"query": ""
-				},
-				{
-					"id": 1,
-					"name": "reward-detail",
-					"pathName": "pages/user/my_follow/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 2,
-					"name": "detail",
-					"pathName": "pages/zl_detail/index",
-					"query": "id=5623",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "result",
-					"pathName": "pages/yuezhan/search_result/index",
-					"query": ""
-				},
-				{
-					"id": 4,
-					"name": "rewas",
-					"pathName": "pages/zl_detail/create_evaluation/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 5,
-					"name": "test",
-					"pathName": "pages/zl_detail/index",
-					"query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
-					"scene": null
-				},
-				{
-					"id": 6,
-					"name": "线下看展",
-					"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
-				},
-				{
-					"id": 11,
-					"name": "博物馆信息",
-					"pathName": "pages/cg_detail/index",
-					"query": "id=14122",
-					"scene": null
-				},
-				{
-					"id": 12,
-					"name": "大场景",
-					"pathName": "pages/wv_page/index",
-					"query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
-					"scene": null
-				},
-				{
-					"id": 13,
-					"name": "test",
-					"pathName": "pages/wv_page/index",
-					"query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
-					"scene": 1091
-				}
-			]
-		}
-	}
+  "description": "项目配置文件。",
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useCompilerModule": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "packNpmRelationList": []
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.11.3",
+  "appid": "wx0e75c90d9db2047b",
+  "projectname": "Small_Program",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "test",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//admin.4dmuseum.cn/showApp.html%3Fm%3D584%26bigScene&id=7152&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/22742475-b1cc-4705-b4a6-84d52231db34.jpg",
+          "scene": 1036,
+          "referrerInfo": {}
+        },
+        {
+          "name": "reward-detail",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "detail",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=5623",
+          "scene": null
+        },
+        {
+          "name": "result",
+          "pathName": "pages/yuezhan/search_result/index",
+          "query": ""
+        },
+        {
+          "name": "rewas",
+          "pathName": "pages/zl_detail/create_evaluation/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
+          "scene": null
+        },
+        {
+          "name": "线下看展",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6158",
+          "scene": null
+        },
+        {
+          "name": "我的收藏",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的足迹",
+          "pathName": "pages/user/my_saw/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的评论",
+          "pathName": "pages/user/my_comment/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "联系我们",
+          "pathName": "pages/user/my_contact/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "博物馆信息",
+          "pathName": "pages/cg_detail/index",
+          "query": "id=14122",
+          "scene": null
+        },
+        {
+          "name": "大场景",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": 1091
+        },
+        {
+          "name": "shouye",
+          "pathName": "pages/wv_page/index",
+          "query": "scene=7411",
+          "scene": null
+        },
+        {
+          "name": "pages/wv_page/index",
+          "pathName": "pages/wv_page/index",
+          "query": "id=25",
+          "scene": null
+        }
+      ]
+    }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }

+ 105 - 0
project.private.config.json

@@ -0,0 +1,105 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "test",
+          "pathName": "pages/yuezhan/pay_page/index",
+          "query": "id=7532",
+          "launchMode": "default",
+          "scene": 1000
+        },
+        {
+          "name": "reward-detail",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "detail",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=5623",
+          "scene": null
+        },
+        {
+          "name": "result",
+          "pathName": "pages/yuezhan/search_result/index",
+          "query": ""
+        },
+        {
+          "name": "rewas",
+          "pathName": "pages/zl_detail/create_evaluation/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6857&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/ea667eb9-8552-4a91-b998-7175112887dc.png",
+          "scene": null
+        },
+        {
+          "name": "线下看展",
+          "pathName": "pages/zl_detail/index",
+          "query": "id=6158",
+          "scene": null
+        },
+        {
+          "name": "我的收藏",
+          "pathName": "pages/user/my_follow/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的足迹",
+          "pathName": "pages/user/my_saw/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "我的评论",
+          "pathName": "pages/user/my_comment/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "联系我们",
+          "pathName": "pages/user/my_contact/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "博物馆信息",
+          "pathName": "pages/cg_detail/index",
+          "query": "id=14122",
+          "scene": null
+        },
+        {
+          "name": "大场景",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//4dscene.4dage.com/playcanvas/museum/shuangerxijinping/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": null
+        },
+        {
+          "name": "test",
+          "pathName": "pages/wv_page/index",
+          "query": "link=https%3A//www.cgaii.com/museum/cultural/index.html&id=25&imageUrl=https://4dkanzhan.4dkankan.com/exhibition/6b193567-c89b-403b-a117-b2f1fe9bd830.jpg",
+          "scene": 1091
+        },
+        {
+          "name": "shouye",
+          "pathName": "pages/wv_page/index",
+          "query": "scene=7411",
+          "scene": null
+        },
+        {
+          "name": "pages/wv_page/index",
+          "pathName": "pages/wv_page/index",
+          "query": "id=25",
+          "scene": null
+        }
+      ]
+    }
+  }
+}

+ 7 - 0
sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

文件差异内容过多而无法显示
+ 5 - 1
utils/images.js


+ 2 - 1
utils/services.js

@@ -3,7 +3,7 @@ const {
 } = require('./util');
 
 const serverName = 'https://www.4dmuseum.cn/2.0'; // 正式
-// const serverName = 'http://192.168.0.177:8081'; // 本地
+// const serverName = 'http://192.168.0.10:8081'; // 本地
 
 //const imgServer = 'https://www.4dmuseum.cn/'
 const imgServer = ''
@@ -21,6 +21,7 @@ const urls = {
 
   //轮播图
   getBannerList: '/wx/api/banner/list',
+  getBannerDetail:'/wx/api/banner/detail',
 
   //展会
   getExhibitionList: "/wx/api/exhibition/listByType",

+ 0 - 3
utils/util.js

@@ -1,7 +1,6 @@
 const QQMapWX = require('../common/component/mapSDK/qqmap-wx-jssdk.min.js');
 const app = require('../app.js');
 
-console.log('jkaslasjdia',app)
 var regChar = { //非特殊字符作为值
   '?':'qweqwqjoijweq',
   '&':'asdauihdasfsdas',
@@ -200,7 +199,6 @@ function recordAccess(options){
   for (let i = 0; i < cookieIDs.length; i++) {
     if (cookieIDs[i] && id == cookieIDs[i]) {
       cookieIDs = removeArrItem(cookieIDs, cookieIDs[i])
-
     }
   }
 
@@ -211,7 +209,6 @@ function recordAccess(options){
 
   app.default.globalData.cookieIDs = cookieIDs
 
-
   console.log(app.default.globalData.cookieIDs)
 }