From 62e377e9580743f0b193f805ea7818faf8d94684 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 16 Feb 2023 17:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/list/food/index.wxss   |  2 +-
 pages/list/six/index.js      | 10 ++++++++++
 pages/list/six/index.wxml    |  8 ++++++--
 pages/search/list/index.wxml |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 7fe404f..3214fff 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest56? true : false;
+      data.isTest = data.isTest57? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/food/index.wxss b/pages/list/food/index.wxss
index 554f85d..94c5cf7 100644
--- a/pages/list/food/index.wxss
+++ b/pages/list/food/index.wxss
@@ -41,7 +41,7 @@ page {
 }
 .item .main-img {
   width: 599rpx;
-  height: 828rpx;
+  height: 1111rpx;
   border-radius: 53rpx;
   display: block;
 }
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index a3b816e..22781a5 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -1,4 +1,6 @@
 // pages/list/six/index.js
+let app = getApp()
+
 import commonApi from "../../../utils/https/common"
 import util from "../../../utils/util"
 Page({
@@ -48,6 +50,14 @@ Page({
 		})
 	}
   },
+  goH5(e){
+    let url = e.currentTarget.dataset.url;
+    app.globalData.weburl = url;
+    console.log(app.globalData.weburl);
+    wx.navigateTo({
+      url: "/pages/pbService/web/index"
+    })
+  },
   getTypes:function(){
     // 获取苏城六纪下面的分类
     commonApi._post("act/get_type_by_area",{
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index e3e1e40..8beacd3 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -51,10 +51,14 @@
     <image class="red-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon7.png" mode="widthFix"></image>
     <view>公共自行车</view>
   </navigator>
-  <navigator url="/pages/pbService/wwcx/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
+  <!-- <navigator url="/pages/pbService/wwcx/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
     <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
-  </navigator>
+  </navigator> -->
+  <view  data-url="https://m.cloud.sz-trip.com/CulturalRelics?area_key={{areas[areaIndex].area_key}}" bindtap="goH5"  class="new-icon">
+    <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
+    <view>文物查询</view>
+  </view>
 </view>
 <view class="new-title">周边推荐</view>
 <view class="list">
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 6e2a3f6..dbcbb41 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -36,7 +36,7 @@
       <view class="scene-tags textOver" style="margin-top:20rpx;margin-bottom:30rpx">
         <text class="scene-tag textOver" wx:for="{{item.ext.display_tags}}">{{item}}</text>
       </view>
-      <view style="margin-bottom:10rpx" class="scene-address textOver"><text class="iconfont icon-location"></text>{{item.ext.address}}</view>
+      <view style="margin-bottom:10rpx" class="scene-address textOver" wx:if="{{item.ext.address}}"><text class="iconfont icon-location"></text>{{item.ext.address}}</view>
       <view class="price-box">
         <view class="textOver" wx:if="{{item.ext.distance}}">距您直线距离{{item.ext.distance}}km</view>
         <view wx:else></view>