commit in 3.28

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

@@ -21,12 +21,12 @@
                 <view class="weui-media-box__desc">{{statusTextDesp}}</view>
 
                 <view wx:if="{{online == 0}}">
-                  <view class='iconfont icon-zuobiao'></view>
+                  <view class='iconfont iconweizhi'></view>
                   <text>{{distance || 0 }} km</text>
                 </view>
 
                 <view wx:if="{{online == 1}}">
-                  <view class='iconfont icon-ren111'></view>
+                  <view class='iconfont iconredu'></view>
                   <text>{{scenePv}}</text>
                 </view>
 

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

@@ -59,15 +59,15 @@
   justify-content: space-between;
   font-weight: normal;
 }
-.weui-media-box__bd_in-appmsg .desc .icon-zuobiao{
-  font-size: 22rpx;
+.weui-media-box__bd_in-appmsg .desc .iconweizhi{
+  font-size: 20rpx;
   display: inline-block;
   vertical-align: text-bottom;
   margin-right: 12rpx;
 
 }
-.weui-media-box__bd_in-appmsg .desc .icon-ren111{
-  font-size: 32rpx;
+.weui-media-box__bd_in-appmsg .desc .iconredu{
+  font-size: 20rpx;
   display: inline-block;
   vertical-align: middle;
   margin-right: 12rpx;

common/components/drop-down/index.js

@@ -54,22 +54,24 @@ Component({
       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 = {} // 触发事件的选项
-      }
+      if (type){
+        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)
+        this.triggerEvent('activeItem', myEventDetail, myEventOption)
+      }
 
     }
   }

pages/cg_detail/index.wxml

@@ -48,7 +48,7 @@
           <view class='cg_detail_title'>展厅简介</view>
 
           <view class='cg_detail_desc'>
-            <view class='cg_detail_desc_con {{ pavilionDetail.description ? "" : "noText"  }}'  >
+            <view class='cg_detail_desc_con {{ pavilionDetail.description ? "" : "noText"  }} {{active ? "active" : ""}}'  >
               <template is="wxParse" data="{{wxParseData:description.nodes}}" />
               <text wx:if="{{!pavilionDetail.description}}" >暂无简介</text>
             </view>

pages/swkz/index.js

@@ -123,6 +123,9 @@ Page({
       let { last: lastPage, totalPages, content: exhibitionList } = res.data.data;
 
       let { openTime } = exhibitionList;
+      exhibitionList.forEach((currentValue) => {
+        currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
+      })
       console.log(res)
       this.setData({
         currentPage: res.data.data.number + 1,

pages/swkz/index.wxml

@@ -1,6 +1,6 @@
 <!--index.wxml-->
 <view class='container'>
- <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'>
+ <navigator hover-class='none' url="{{item.hasProduct ?('../wv_page/index?link='+item.product.link) : ('../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'}}">
         <text class='fdkz-card-tag-txt'>{{item.statusText||'常设展'}}</text>

pages/tongcheng/index.js

@@ -205,7 +205,8 @@ Page({
 
   showDrop: function (e) {
     let tag = e.target.dataset.id
-    let name = e._relatedInfo.anchorTargetText
+    console.log(e)
+    let name = e.target.dataset.test
     console.log(tag)
     if (tag==='type'){
       this.setData({
@@ -274,6 +275,7 @@ Page({
     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);
 
     this.setData({

pages/tongcheng/index.wxml

@@ -11,11 +11,11 @@
           <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 bindtap='showDrop' data-id='dist' data-test='{{activeDist}}' class='nav-tag'>{{activeDist}}
+            <text data-id='dist' class='iconfont iconpaixuxialacaidan'></text>
           </view>
-          <view bindtap='showDrop' data-id='type' class='nav-tag'>{{activeType}}
-            <text class='iconfont iconpaixuxialacaidan'></text>
+          <view bindtap='showDrop' data-id='type' data-test='{{activeType}}' class='nav-tag'>{{activeType}}
+            <text data-id='type' class='iconfont iconpaixuxialacaidan'></text>
           </view>
         </view>
       </view>

pages/wv_page/index.js

@@ -17,10 +17,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options)
     let url = ''
     let { currentUrl } = app.globalData;
     console.log(currentUrl)
-    if (currentUrl){
+    if (currentUrl.indexOf("https") != -1 ){
       url = app.globalData.currentUrl;
     }else{
       url = unescape(options.link);

pages/yuezhan/index.js

@@ -136,7 +136,10 @@ Page({
         openTime
       } = exhibitionList;
       console.log(res)
-      exhibitionList.forEach((currentValue) => currentValue.distance = Math.ceil(currentValue.distance))
+      exhibitionList.forEach((currentValue) => {
+        currentValue.distance = Math.ceil(currentValue.distance);
+        currentValue.product ? currentValue.product.link = escape(currentValue.product.link) : '';
+      })
       this.setData({
         currentPage: res.data.data.number + 1,
         lastPage,
@@ -171,6 +174,9 @@ Page({
           })
           this.fetchData(page)
         },
+        fail: (res) => {
+          this.fetchData(page)
+        }
       })
     }
   },
@@ -295,8 +301,10 @@ Page({
       pagetype,
       urltype,
       hasproduct,
-      haspay
+      haspay,
+      productlink
     } = e.currentTarget.dataset;
+    console.log(e.currentTarget.dataset)
 
 
     app.globalData.currentUrl = url
@@ -326,7 +334,7 @@ Page({
           case 1:
             if (hasproduct) {
               wx.navigateTo({
-                url: `./pay_page/index?id=${url}`,
+                url: `../wv_page/index?link=${escape(productlink)}`,
                 success: function(res) {},
                 fail: function(res) {},
                 complete: function(res) {},

pages/yuezhan/index.wxml

@@ -15,13 +15,13 @@
     </view>
   </view>
   <swiper wx:if="{{tag==0&&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-url="{{item.url}}" data-id="{{item.id}}" wx:key="{{item.id}}">
+    <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-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&&!item.hasPay?('./pay_page/index?id='+item.id):(item.hasProduct?'../wv_page/index?id='+item.id:'../zl_detail/index?id='+item.id)}}" wx:for="{{exhibitionList}}" wx:key="index" class='fdkz-card'>
+    <navigator hover-class='none' url="{{item.hasProduct ? ('../wv_page/index?link='+item.product.link):('../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.hasProduct?'':'fdkz-card-tag_offline'}}">
           <text class='fdkz-card-tag-txt'>{{item.statusText||'常设展'}}</text>
@@ -40,7 +40,7 @@
         <view class='fdkz-card-info-date'>
           <view class='left'>
             <view class='date-txt'>{{item.pavilionName}}</view>
-            <view class='date-day'>{{item.statusTextDesp}}</view>
+            <!-- <view class='date-day'>{{item.statusTextDesp}}</view> -->
           </view>
           <view class='right'>
             <view class="date-icon iconfont  {{item.hasProduct?'iconredu':'iconweizhi'}}"></view>

pages/zl_detail/index.wxss

@@ -275,6 +275,13 @@
 
 .cg_address, .iconkedianjibiaoshiicon{
   color: #e02f2f!important;
+
+}
+
+.cg_address{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .iconkedianjibiaoshiicon{

project.config.json

@@ -32,7 +32,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 10,
+			"current": 11,
 			"list": [
 				{
 					"id": 0,
@@ -108,6 +108,13 @@
 					"pathName": "pages/user/my_contact/index",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": 11,
+					"name": "博物馆信息",
+					"pathName": "pages/cg_detail/index",
+					"query": "id=14137",
+					"scene": null
 				}
 			]
 		}