From c89a594ee9981e7e2ece58330eab3ebd0e413a8d Mon Sep 17 00:00:00 2001
From: Myth <bzysff@163.com>
Date: Thu, 21 Oct 2021 16:59:44 +0800
Subject: [PATCH] 1

---
 pages/index/index.wxml                 |  4 ++--
 pages/info/culturalUnitInfo/index.wxml |  1 +
 pages/list/culturalUnit/index.wxml     |  2 +-
 pages/pbService/activity/index.js      | 15 +++++++++++++++
 pages/pbService/activity/index.wxml    |  4 ++--
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7bcb210..5a3933f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -247,9 +247,9 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
         <view>廉洁地图</view>
       </view> -->
-      <view bindtap="gotoPath" data-title="文化单位" data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-title="文旅单位" data-path="/pages/list/culturalUnit/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
-        <view>文化单位</view>
+        <view>文旅单位</view>
       </view>
     </view>
   </scroll-view>
diff --git a/pages/info/culturalUnitInfo/index.wxml b/pages/info/culturalUnitInfo/index.wxml
index cac14f9..16ed78c 100644
--- a/pages/info/culturalUnitInfo/index.wxml
+++ b/pages/info/culturalUnitInfo/index.wxml
@@ -1,5 +1,6 @@
 <!--pages/info/culturalUnitInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
+<title wx:if="{{info}}" title="{{info.company_name}}"></title>
 <view wx:if="{{info}}" class="bg" style="top:{{top}}px">
   <swiper class="page" vertical bindchange="changeSlide">
     <swiper-item>
diff --git a/pages/list/culturalUnit/index.wxml b/pages/list/culturalUnit/index.wxml
index fcac7c1..9025793 100644
--- a/pages/list/culturalUnit/index.wxml
+++ b/pages/list/culturalUnit/index.wxml
@@ -1,5 +1,5 @@
 <!--pages/list/culturalUnit/index.wxml-->
-<title title="文化单位"></title>
+<title title="文旅单位"></title>
 <navigator wx:for="{{list}}" url="/pages/info/culturalUnitInfo/index?id={{item.id}}" class="item">
   <image src="{{item.head_img}}" mode="aspectFill"></image>
   <view class="textOver title">{{item.company_name}}</view>
diff --git a/pages/pbService/activity/index.js b/pages/pbService/activity/index.js
index 05a594e..544c647 100644
--- a/pages/pbService/activity/index.js
+++ b/pages/pbService/activity/index.js
@@ -1,5 +1,6 @@
 // pages/pbService/activity/index.js
 import https from "../../../utils/https/common"
+const app = getApp()
 Page({
 
   /**
@@ -30,6 +31,20 @@ Page({
       })
     })
   },
+  gotoDetail(e){
+    let item = e.currentTarget.dataset.item;
+    if(item.mini_url && item.mini_url.indexOf('https://m.cloud.sz-trip.com')==-1){
+      wx.navigateTo({
+        url: item.mini_url
+      })
+    }
+    else {
+      app.globalData.weburl = item.h5_url
+      wx.navigateTo({
+        url: '/pages/pbService/web/index'
+      })
+    }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml
index a12beda..ee45eca 100644
--- a/pages/pbService/activity/index.wxml
+++ b/pages/pbService/activity/index.wxml
@@ -2,12 +2,12 @@
 <title title="精彩回顾"></title>
 <image mode="widthFix" class="topimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/pbservice/hgtop.png"></image>
 <view class="list">
-  <navigator url="{{item.mini_url}}" class="item" wx:for="{{list}}" wx:if="{{item.mini_url}}">
+  <view bindtap="gotoDetail" data-item="{{item}}" url="{{item.mini_url}}" class="item" wx:for="{{list}}">
     <image mode="aspectFill" class="bgimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/pbservice/hgbg.png"></image>
     <image src="{{item.head_image}}" mode="aspectFill" class="main-img"></image>
     <view class="info">
       <view class="textOver title">{{item.title}}</view>
       <view class="textOver">{{item.desc}}</view>
     </view>
-  </navigator>
+  </view>
 </view>