diff --git a/app.js b/app.js
index 5acc553..cd1024b 100644
--- a/app.js
+++ b/app.js
@@ -90,6 +90,42 @@ App({
       this.overShare();
     })
   },
+  //app.js
+convertHtmlToText: function(inputText) {
+  var returnText = "" + inputText;
+  returnText = returnText.replace(/<\/div>/ig, '\r\n');
+  returnText = returnText.replace(/<\/li>/ig, '\r\n');
+  returnText = returnText.replace(/<li>/ig, '  *  ');
+  returnText = returnText.replace(/<\/ul>/ig, '\r\n');
+  //-- remove BR tags and replace them with line break
+  returnText = returnText.replace(/<br\s*[\/]?>/g, "\r\n");
+
+  //-- remove P and A tags but preserve what's inside of them
+  returnText = returnText.replace(/<p.*?>/g, "\r\n");
+  returnText = returnText.replace(/<a.*href="(.*?)".*>(.*?)<\/a>/g, " $2 ($1)");
+
+  //-- remove all inside SCRIPT and STYLE tags
+  returnText = returnText.replace(/<script.*>[\w\W]{1,}(.*?)[\w\W]{1,}<\/script>/g, "");
+  returnText = returnText.replace(/<style.*>[\w\W]{1,}(.*?)[\w\W]{1,}<\/style>/g, "");
+  //-- remove all else
+  returnText = returnText.replace(/<(?:.|\s)*?>/g, "");
+
+  //-- get rid of more than 2 multiple line breaks:
+  returnText = returnText.replace(/(?:(?:\r\n|\r|\n)\s*){2,}/g, "\r\n\r\n");
+
+  //-- get rid of more than 2 spaces:
+  returnText = returnText.replace(/ +(?= )/g, '');
+
+  //-- get rid of html-encoded characters:
+  returnText = returnText.replace(/ /g, " ");
+  returnText = returnText.replace(/&/g, "&");
+  returnText = returnText.replace(/&quot;/g, '\'');
+  returnText = returnText.replace(/&lt;/g, '<');
+  returnText = returnText.replace(/&gt;/g, '>');
+  // returnText = returnText.replace(/img/g, 'image');
+
+  return returnText;
+},
   //重写分享方法
   overShare: function () {
     //监听路由切换
diff --git a/pages/list/six/index.json b/pages/list/six/index.json
index 9f79876..4cc7ccc 100644
--- a/pages/list/six/index.json
+++ b/pages/list/six/index.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "search":"/pages/component/SearchHeader"
+    "search":"/pages/component/SearchHeader",
+    "title":"/pages/component/TitleHeader"
   }
 }
\ No newline at end of file
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index f287261..e19a8a8 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -1,5 +1,7 @@
 <!--pages/list/six/index.wxml-->
-<search bind:onload="search"></search>
+<!-- <search bind:onload="search"></search> -->
+<title title="十全街"></title>
+
 <!-- <image src="https://resource.sz-trip.com/uploads/20190831/3ecfcb81bab36027606676737788110c.png" mode="aspectFill" class="topbg"></image> -->
 <image src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg"></image>
 <view class="types-box">
@@ -61,10 +63,11 @@
     <view class="textOver2 title">{{item.title}}</view>
     <view class="location textOver"><text class="iconfont icon-location"></text>{{item.address}}</view>
     <view class="price" wx:if="{{item.price}}"><text class="unit">￥</text><text class="number">{{item.price/100}}</text><text>起</text></view>
-    <view class="price" wx:else><text class="number">免费</text></view>
+    <!-- <view class="price" wx:else><text class="number">0.00</text></view> -->
+    <view class="price" wx:else><text class="unit">￥</text><text class="number">0.00</text><text>起</text></view>
+  </view>
+  <view wx:if="{{list.length==0}}" class="common-empty1" style="z-index:-1;">
+    <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
+    <view>暂无内容</view>
   </view>
-</view>
-<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:300rpx">
-  <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
-  <view>暂无内容</view>
 </view>
\ No newline at end of file
diff --git a/pages/list/six/index.wxss b/pages/list/six/index.wxss
index 4bcfd63..01e1376 100644
--- a/pages/list/six/index.wxss
+++ b/pages/list/six/index.wxss
@@ -44,6 +44,7 @@
   margin: 25rpx;
   justify-content: space-between;
   flex-wrap: wrap;
+  position: relative;
 }
 .item {
   width: 312rpx;
@@ -127,4 +128,25 @@
 }
 .new-icon image.yellow-shadow {
   box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(194, 123, 20, 0.24);
+}
+.common-empty1 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  font-size: 28rpx;
+  color: #999;
+  text-align: center;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 0;
+  height:328rpx;
+  margin-bottom:40rpx ;
+}
+.common-empty1 image {
+  width: 328rpx;
+  margin-bottom: 20rpx;
 }
\ No newline at end of file
diff --git a/pages/list/strategy/index.js b/pages/list/strategy/index.js
index f23c328..723c474 100644
--- a/pages/list/strategy/index.js
+++ b/pages/list/strategy/index.js
@@ -11,7 +11,7 @@ Page({
     page_no:1,
     total:1,
     keywords:"",
-    type:1,
+    type:0,
     showKeyword:""
   },
 
diff --git a/pages/list/strategy/index.wxml b/pages/list/strategy/index.wxml
index 68112d7..1ca2425 100644
--- a/pages/list/strategy/index.wxml
+++ b/pages/list/strategy/index.wxml
@@ -7,18 +7,19 @@
 </view>
 <image class="topimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/topBac.png" mode="widthFix"></image>
 <view class="types">
-  <view class="type {{type==1?'active':''}}" bindtap="changeType" data-type="1">
-    <image wx:if="{{type==1}}" class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBacActive.png" mode="aspectFill"></image>
-    <image wx:else class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBac.png" mode="aspectFill"></image>
-    <image class="iconimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/listtop/sc{{type==1?'0':'new1'}}.png" mode="aspectFill"></image>
-    <view>官方手册</view>
-  </view>
+
   <view class="type {{type==0?'active':''}}" bindtap="changeType" data-type="0">
     <image wx:if="{{type==0}}" class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBacActive.png" mode="aspectFill"></image>
     <image wx:else class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBac.png" mode="aspectFill"></image>
     <image class="iconimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/listtop/gl{{type==0?'0':'new1'}}.png" mode="aspectFill"></image>
     <view>达人攻略</view>
   </view>
+  <view class="type {{type==1?'active':''}}" bindtap="changeType" data-type="1">
+    <image wx:if="{{type==1}}" class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBacActive.png" mode="aspectFill"></image>
+    <image wx:else class="bgimg" src="https://m.cloud.sz-trip.com/static/images/TravelNotesIntroduction/navBac.png" mode="aspectFill"></image>
+    <image class="iconimg" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/listtop/sc{{type==1?'0':'new1'}}.png" mode="aspectFill"></image>
+    <view>官方手册</view>
+  </view>
 </view>
 <view class="list" wx:if="{{type==0}}">
   <navigator url="/pages/info/strategyInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
diff --git a/pages/map/index.json b/pages/map/index.json
index 9f79876..074fb77 100644
--- a/pages/map/index.json
+++ b/pages/map/index.json
@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "search":"/pages/component/SearchHeader"
+    "search":"/pages/component/SearchHeader",
+    "title":"/pages/component/TitleHeader"
+
   }
 }
\ No newline at end of file
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index d74c8cb..fb97d33 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -1,5 +1,6 @@
 <!--pages/map/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
+<title title="图游"></title>
 <map class="map" id="map" style="height:100%" wx:if="{{areas.length>0}}" longitude="{{areas[areaIndex]?areas[areaIndex].lon:longitude}}" latitude="{{areas[areaIndex]?areas[areaIndex].lat:latitude}}" show-location markers="{{list}}" bindmarkertap="onTapMarker" bindregionchange="changeRegion">
 </map>
 <view style="height:{{topHeight}}px"></view>
diff --git a/pages/user/likes/index.js b/pages/user/likes/index.js
index 3e901c1..1a48a93 100644
--- a/pages/user/likes/index.js
+++ b/pages/user/likes/index.js
@@ -6,7 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    type:1,
+    type:2,
     list:[],
     total:1
   },
diff --git a/pages/user/likes/index.wxml b/pages/user/likes/index.wxml
index 0706c65..8a55177 100644
--- a/pages/user/likes/index.wxml
+++ b/pages/user/likes/index.wxml
@@ -1,8 +1,8 @@
 <!--pages/user/likes/index.wxml-->
 <title title="我的收藏"></title>
 <view class="types">
-  <view class="type{{type==1?' active':''}}" bindtap="changeType" data-type="1">产品</view>
   <view class="type{{type==2?' active':''}}" bindtap="changeType" data-type="2">景点</view>
+  <view class="type{{type==1?' active':''}}" bindtap="changeType" data-type="1">产品</view>
 </view>
 <view style="height:87rpx"></view>
 <view wx:if="{{type==1}}" wx:for="{{list}}" class="goods-item {{item.isTouchMove ? 'touch-move-active' : ''}}" bindtouchstart='touchStart' bindtouchmove='touchmove' data-index="{{index}}">
diff --git a/pages/user/order/team/list.wxml b/pages/user/order/team/list.wxml
index 99f3ece..7a3f7ce 100644
--- a/pages/user/order/team/list.wxml
+++ b/pages/user/order/team/list.wxml
@@ -1,5 +1,5 @@
 <!--pages/user/order/list.wxml-->
-<title title="订单"></title>
+<title title="团体预约"></title>
 <view class="fixed-top">
   <view class="search-box">
     <view class="iconfont icon-sousuo"></view>
diff --git a/pages/user/personalInfo/index.js b/pages/user/personalInfo/index.js
index cd10b9d..09989c5 100644
--- a/pages/user/personalInfo/index.js
+++ b/pages/user/personalInfo/index.js
@@ -15,7 +15,7 @@ Page({
     title: "为提供相应的产品和服务，并保障系统的安全稳定运行，我们可能会收集你的以下个人信息",
     childList: [],
     flag: true,
-    nowTitle: ""
+    nowTitle: "个人信息收集清单"
   },
 
   /**
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 942e837..6fb1606 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -50,7 +50,7 @@
     </navigator>
 
     <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
-      团体订单
+      团体预约订单
     </navigator>
     <!-- <navigator url="videoCoupon/index" class="user-box-line">
     中奖纪录
diff --git a/pages/user/userPrivacy/index.js b/pages/user/userPrivacy/index.js
index 8412a7d..43bb8f6 100644
--- a/pages/user/userPrivacy/index.js
+++ b/pages/user/userPrivacy/index.js
@@ -28,11 +28,12 @@ Page({
       console.log(res);
       res=res.data
       this.setData({
-        info:res[0].content,
+        info:app.convertHtmlToText(res[0].content),
         title:res[0].type_name
       })
     })
   },
+  
 
   /**
    * 生命周期函数--监听页面显示
diff --git a/pages/user/userPrivacy/index.wxml b/pages/user/userPrivacy/index.wxml
index 2a73447..3061d37 100644
--- a/pages/user/userPrivacy/index.wxml
+++ b/pages/user/userPrivacy/index.wxml
@@ -1,11 +1,12 @@
 <!--pages/user/address/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
 <view>
   <title-header title="{{title}}"></title-header>
   <view class="title">{{title}}</view>
   <view class="text">
-    <rich-text >
-    {{info}}
-  </rich-text>
+    <rich-text>
+      {{info}}
+    </rich-text>
   </view>
 
 </view>
\ No newline at end of file