From 56383d0a6e3b63c9fbfab20be5d2da5b17d9a2de Mon Sep 17 00:00:00 2001
From: Myth <bzysff@163.com>
Date: Fri, 31 Dec 2021 15:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                           |  2 +-
 pages/index/index.js             |  6 ++----
 pages/index/index.wxml           |  4 ++--
 pages/info/redmapInfo/index.wxml | 11 ++++++++++-
 pages/info/redmapInfo/index.wxss | 16 ++++++++++++++--
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index b5d0901..3814e19 100644
--- a/app.js
+++ b/app.js
@@ -22,7 +22,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest3;
+      data.isTest = data.isTest5?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/index/index.js b/pages/index/index.js
index f7ca8a1..3911765 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -289,14 +289,12 @@ Page({
 
     })
   },
-  // 热门推荐
+  // 热门推荐 去掉经纬度  接口排序方式变更（韩阳）
   getList:function(){
     if(!this.data.listMore) return;
     commonApi._post("search/recommend",{
       offset:this.data.list.length,
-      limit:16,
-      lon:this.data.lon,
-      lat:this.data.lat
+      limit:16
     }).then(res=>{
       res.data.map(item=>{
         if(item.ext.display_tags){
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 2efa244..97b0406 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -315,14 +315,14 @@
         <view wx:else class="hot-item">
           <view style="position:relative">
             <common-image width="100%" src="{{item.ext.headimg}}" mode="widthFix"></common-image>
-            <view class="hot-location textOver"><text class="iconfont icon-location"></text>{{item.ext.address}}</view>
+            <view wx:if="{{item.type!='act_calendar' && item.ext.address}}" class="hot-location textOver"><text class="iconfont icon-location"></text>{{item.ext.address}}</view>
           </view>
           <view class="hot-info">
             <view class="hot-title">{{item.title}}</view>
             <view class="tags textOver">
               <view wx:for="{{item.ext.display_tags}}" class="tag textOver">{{item}}</view>
             </view>
-            <view wx:if="{{item.ext.type!='tenscenic'}}" class="hot-price">
+            <view wx:if="{{item.ext.type!='tenscenic' && item.ext.price}}" class="hot-price">
               <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
           </view>
         </view>
diff --git a/pages/info/redmapInfo/index.wxml b/pages/info/redmapInfo/index.wxml
index 67a8fc7..145f6c0 100644
--- a/pages/info/redmapInfo/index.wxml
+++ b/pages/info/redmapInfo/index.wxml
@@ -22,13 +22,22 @@
       <image mode="widthFix" class="infoline1" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
       <image mode="widthFix" class="infoline2" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline2.png"></image>
       <image mode="widthFix" class="infoline3" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline3.png"></image>
+      <view class="tips">
+        <view>中共苏州市委党史工作办公室</view>
+        <view>苏州市文化广电和旅游局</view>
+        <view>联合出品</view>
+      </view>
     </swiper-item>
     <swiper-item wx:for="{{htmls}}">
-      <view class="title title2">{{info.company_name}}</view>
       <image mode="widthFix" class="infoline1" style="position:static" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline1.png"></image>
       <rich-text class="detail" nodes="{{tool.formateRichText(item)}}"></rich-text>
       <image mode="widthFix" class="infoline2" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline2.png"></image>
       <image mode="widthFix" class="infoline3" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infoline3.png"></image>
+      <view class="tips">
+        <view>中共苏州市委党史工作办公室</view>
+        <view>苏州市文化广电和旅游局</view>
+        <view>联合出品</view>
+      </view>
     </swiper-item>
   </swiper>
   <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
diff --git a/pages/info/redmapInfo/index.wxss b/pages/info/redmapInfo/index.wxss
index 675868e..29cea5d 100644
--- a/pages/info/redmapInfo/index.wxss
+++ b/pages/info/redmapInfo/index.wxss
@@ -10,7 +10,7 @@
 .title {
   display: flex;
   align-items: flex-end;
-  height: 190rpx;
+  height: 130rpx;
   color: #0B898E;
   font-size: 48rpx;
   font-weight: bold;
@@ -22,7 +22,7 @@
   width: 720rpx;
   position: absolute;
   left: 0;
-  top: 190rpx;
+  top: 130rpx;
 }
 .page {
   width: 100%;
@@ -80,4 +80,16 @@
   font-size: 36rpx;
   height: 126rpx;
   margin-bottom: 0;
+}
+.tips {
+  position: absolute;
+  left: 0;
+  right: 0;
+  text-align: center;
+  color: #0b898e;
+  font-size: 28rpx;
+  bottom: 100rpx;
+}
+.tips view:last-child {
+  margin-top: 20rpx;
 }
\ No newline at end of file